Alex Savenko / semena

Commit 2170fea9b9d1c84f03862721393f82a571a3bfbf

Authored by Eugeny Galkovskiy
2 parents 92b8fc40 ab2701f3

Merge remote-tracking branch 'origin/master'

Showing 26 changed files with 330 additions and 143 deletions   Show diff stats
Inline Side-by-side
src/app/backend/controllers/CustomersController.php
  Show/Hide comments   View file @2170fea
... ... @@ -80,8 +80,9 @@ class CustomersController extends \Phalcon\Mvc\Controller
80 80 $data['password'] = $this->common->hashPasswd($data['password']);
81 81 }
82 82  
  83 + $current_customer = $this->models->getCustomers()->getCustomerByEmail($data['email']);
83 84  
84   - if( !empty( $data ) && !isset($this->models->getCustomers()->getCustomerByEmail($data['email'])['0']) )
  85 + if( !empty( $data ) && isset($current_customer[0]))
85 86 {
86 87 if( $this->models->getCustomers()->UpdateData( $data, $id ) )
87 88 {
... ... @@ -95,12 +96,12 @@ class CustomersController extends \Phalcon\Mvc\Controller
95 96 }
96 97 else
97 98 {
98   - $this->flash->error('Пользователь с таким эмейлом уже существует');
  99 + $this->flash->error('Пользователь с таким эмейлом не найден');
99 100 }
100 101 }
101 102  
102 103 $users_group = $this->models->getUsersGroup()->getAllData(1);
103   - $special_users = $this->models->getSpecialUsers()->getAllData(1);
  104 + $special_users = $this->models->getSpecialUsers()->getAllData(1, 0);
104 105 $data = $this->models->getCustomers()->getOneData($id);
105 106 $this->view->pick( 'customers/addEdit' );
106 107  
... ...
src/app/backend/views/customers/addEdit.php
  Show/Hide comments   View file @2170fea
... ... @@ -23,11 +23,12 @@
23 23  
24 24 <div class="clearfix input_wrapper">
25 25 <div class="label"><label for="users_group">Группа пользователей</label></div>
26   - <div class="input"><select name="users_group" id="group">
  26 + <div class="input">
  27 + <select name="users_group" id="group">
27 28 <?php if(isset( $users_group ) && !empty( $users_group)) {
28 29 foreach($users_group as $group){
29   - if(isset( $page['0']['groups'] ) && !empty( $page['0']['groups'])):?>
30   - <option value="<?= $group['id']?>"<?= ($group['id']==$page['0']['groups'])?"selected":''?>><?= $group['name']?></option>
  30 + if(isset( $page[0]['users_group_id'] ) && !empty( $page[0]['users_group_id'])):?>
  31 + <option value="<?= $group['id']?>" <?php if($group['id']==$page[0]['users_group_id']) echo 'selected="selected"'; ?>><?= $group['name']?></option>
31 32 <?php else: ?>
32 33 <option value="<?= $group['id']?>"><?= $group['name']?></option>
33 34 <?php endif;
... ... @@ -38,17 +39,19 @@
38 39  
39 40 <div class="clearfix input_wrapper">
40 41 <div class="label"><label for="special_users">Группа дилеров</label></div>
41   - <div class="input"><select name="special_users" id="group">
  42 + <div class="input">
  43 + <select name="special_users" id="group">
42 44 <?php if(isset( $special_users ) && !empty( $special_users)) {
43 45 foreach($special_users as $group){
44   - if(isset( $page['0']['groups'] ) && !empty( $page['0']['groups'])):?>
45   - <option value="<?= $group['id']?>"<?= ($group['id']==$page['0']['groups'])?"selected":''?>><?= $group['name']?></option>
  46 + if(isset( $page['0']['special_users_id'] ) && !empty( $page['0']['special_users_id'])):?>
  47 + <option value="<?= $group['id']?>"<?= ($group['id']==$page['0']['special_users_id'])?"selected":''?>><?= $group['name']?></option>
46 48 <?php else: ?>
47 49 <option value="<?= $group['id']?>"><?= $group['name']?></option>
48 50 <?php endif;
49 51 }
50 52 }?>
51   - </select></div>
  53 + </select>
  54 + </div>
52 55 </div>
53 56  
54 57  
... ...
src/app/frontend/controllers/CustomerController.php
  Show/Hide comments   View file @2170fea
... ... @@ -499,7 +499,7 @@ class CustomerController extends \controllers\ControllerBase
499 499 $order_passwd_new = $this->request->getPost('order_passwd_new', 'string', NULL );
500 500 $order_passwd = $this->request->getPost('order_passwd', 'string', NULL );
501 501 $customer_edit['passwd'] = (strlen($order_passwd_new)>0) ? $this->common->hashPasswd($order_passwd_new) : $order_passwd;
502   - $customer_edit['users_group_id'] = $this->request->getPost('users_group_id', 'string', NULL );
  502 + //$customer_edit['users_group_id'] = $this->request->getPost('users_group_id', 'string', NULL );
503 503  
504 504 /*foreach( $customer_edit as $o )
505 505 {
... ... @@ -528,7 +528,8 @@ class CustomerController extends \controllers\ControllerBase
528 528 if( $this->models->getCustomers()->editCustomer( $customer_edit ) )
529 529 {
530 530 $this->flash->success( $this->languages->getTranslation()->_("successfully_changed_your_profile") );
531   - $this->session->set('users_group_id', $customer_edit['users_group_id']);
  531 +
  532 + if (!empty($customer_edit['users_group_id'])) $this->session->set('users_group_id', $customer_edit['users_group_id']);
532 533 return $this->response->redirect($_SERVER['HTTP_REFERER']);
533 534 }
534 535 else
... ...
src/app/frontend/controllers/MenuController.php
  Show/Hide comments   View file @2170fea
... ... @@ -411,6 +411,15 @@ class MenuController extends \controllers\ControllerBase
411 411 $special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0];
412 412 }
413 413  
  414 + //vip
  415 + $users_group_id = $this->session->get('users_group_id');
  416 + if (isset($users_group_id) && $users_group_id == 37) {
  417 + if ($this->common->applyDiscount(5, $cart_items['items'])) {
  418 + $this->common->countOrderSum($cart_items);
  419 + $cart_items['total_price'] = $cart_items['total_sum'];
  420 + }
  421 + }
  422 +
414 423 //discount
415 424  
416 425 $discount = $this->models->getDiscount()->getActiveData();
... ...
src/app/frontend/controllers/PageController.php
  Show/Hide comments   View file @2170fea
... ... @@ -15,12 +15,12 @@
15 15 $titlecmp = function ($a, $b) {
16 16 return strcasecmp($a['title'], $b['title']);
17 17 };
18   -
  18 +
  19 + $users_group_name = \config::get('frontend#defaults/default_users_group');
  20 +
19 21 if($this->session->has('id') && $this->session->get('users_group_id') != null) {
20 22 $users_group = $this->models->getUsersGroup()->getOneData($this->session->get('users_group_id'));
21   - $users_group_name = $users_group['0']['name'];
22   - } else {
23   - $users_group_name = \config::get('frontend#defaults/default_users_group');
  23 + if (isset($users_group[0]['name'])) $users_group_name = $users_group['0']['name'];
24 24 }
25 25  
26 26 $catalog = $this->common->getTypeSubtype1( NULL, $this->lang_id )['catalog'];
... ... @@ -136,14 +136,16 @@
136 136 $active_sales[$k]['seconds_left'] = $timestamp_left - $now;
137 137 }
138 138  
  139 + //discount
139 140 $discount = $this->models->getDiscount()->getActiveData();
140 141 if (!empty($discount)) {
141 142 $discount = $discount[0];
142 143 $discount['group_ids'] = str_replace('{', '', $discount['group_ids']);
143 144 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
144 145 $discount['group_ids'] = explode(',', $discount['group_ids']);
145   -
146 146 }
  147 + //vip
  148 + $users_group_id = $this->session->get('users_group_id');
147 149  
148 150 $css = [
149 151 '/landing_sales/style.css',
... ... @@ -181,7 +183,8 @@
181 183 'meta_description' => $meta_description[$this->lang_id],
182 184 'slider' => $slider,
183 185 'active_sales' => $active_sales,
184   - 'discount' => $discount
  186 + 'discount' => $discount,
  187 + 'users_group_id' => $users_group_id
185 188 ]);
186 189 }
187 190  
... ... @@ -435,6 +438,7 @@
435 438 '2' => (isset( $seo['description'] ) && !empty( $seo['description'] ) ? $seo['description'] : 'Заказать '.$catalog['catalog']['title'].' в Киеве по лучшей цене. Качество товара подтверждена профессионалами.').(isset( $page ) && !empty( $page ) && $page != '1' ? ' страница '.$page : '')
436 439 ];
437 440  
  441 + //discount
438 442 $discount = $this->models->getDiscount()->getActiveData();
439 443 if (!empty($discount)) {
440 444 $discount = $discount[0];
... ... @@ -442,6 +446,8 @@
442 446 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
443 447 $discount['group_ids'] = explode(',', $discount['group_ids']);
444 448 }
  449 + //vip
  450 + $users_group_id = $this->session->get('users_group_id');
445 451  
446 452 if($subtype==='semena_gazonnykh_trav_1c_21')
447 453 $this->view->setMainView('landing');
... ... @@ -476,7 +482,8 @@
476 482 'catalog_sales' => $catalog_sales,
477 483 'css' => $cssSale,
478 484 'js' => $jsSale,
479   - 'discount' => $discount
  485 + 'discount' => $discount,
  486 + 'users_group_id' => $users_group_id
480 487 ]);
481 488 }
482 489 else
... ... @@ -705,6 +712,7 @@
705 712 }
706 713 }
707 714  
  715 + //discount
708 716 $discount = $this->models->getDiscount()->getActiveData();
709 717 if (!empty($discount)) {
710 718 $discount = $discount[0];
... ... @@ -712,6 +720,8 @@
712 720 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
713 721 $discount['group_ids'] = explode(',', $discount['group_ids']);
714 722 }
  723 + //vip
  724 + $users_group_id = $this->session->get('users_group_id');
715 725  
716 726 $cssSale = [
717 727 'https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic',
... ... @@ -755,7 +765,8 @@
755 765 'catalog_sales' => $catalog_sales,
756 766 'css' => $cssSale,
757 767 'js' => $jsSale,
758   - 'discount' => $discount
  768 + 'discount' => $discount,
  769 + 'users_group_id' => $users_group_id
759 770 ]);
760 771 }
761 772  
... ... @@ -921,6 +932,7 @@
921 932 '2' => isset($seo['description']) && !empty($seo['description']) ? $seo['description'] : 'Профессионалы рекомендуют ' . $catalog_name . ' ' . $item['0']['title'] . ' в интернет магазине семян Semena.in.ua.'
922 933 ];
923 934  
  935 + //discount
924 936 $discount = $this->models->getDiscount()->getActiveData();
925 937 if (!empty($discount)) {
926 938 $discount = $discount[0];
... ... @@ -928,6 +940,8 @@
928 940 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
929 941 $discount['group_ids'] = explode(',', $discount['group_ids']);
930 942 }
  943 + //vip
  944 + $users_group_id = $this->session->get('users_group_id');
931 945  
932 946 $this->view->setVars([
933 947 'change_lang_url' => $lang_url,
... ... @@ -950,7 +964,8 @@
950 964 'catalog_id' => $catalog_id,
951 965 'type_alias' => $type_alias,
952 966 'subtype_alias' => $subtype_alias,
953   - 'discount' => $discount
  967 + 'discount' => $discount,
  968 + 'users_group_id' => $users_group_id
954 969 ]);
955 970 }
956 971 else
... ... @@ -1034,22 +1049,22 @@
1034 1049 $item = $this->models->getItems()->getOneItem( $this->lang_id, $item_id );
1035 1050 $filters = $this->models->getFilters()->getFiltersByItemId( $this->lang_id, $item_id );
1036 1051 $colors_info = $this->models->getItems()->getColorsInfoByColorId( $this->lang_id, $item['0']['color_id'] );
1037   -
  1052 +
1038 1053 $item['0']['color_title'] = NULL;
1039 1054 $item['0']['absolute_color'] = NULL;
1040 1055 $item['0']['color'] = NULL;
1041   -
  1056 +
1042 1057 if( !empty( $colors_info ) )
1043 1058 {
1044 1059 $item['0']['color_title'] = $colors_info['0']['color_title'];
1045 1060 $item['0']['absolute_color'] = $colors_info['0']['absolute_color'];
1046   -
1047   -
  1061 +
  1062 +
1048 1063 $item['0']['color'] =
1049 1064 '<div class="float properties">'.$this->languages->getTranslation()->_("choose_color").': </div>'.
1050 1065 '<div class="float properties" style="color:'.$colors_info['0']['absolute_color'].'">'.$colors_info['0']['color_title'].'</div>';
1051 1066 }
1052   -
  1067 +
1053 1068 $item['0']['explode'] = explode( '/', $item['0']['full_alias'] );
1054 1069 $item['0']['type_alias'] = $item['0']['explode']['1'];
1055 1070 $item['0']['subtype_alias'] = $item['0']['explode']['2'];
... ... @@ -1060,29 +1075,29 @@
1060 1075 $item['0']['status_real'] = $item['0']['status'];
1061 1076 $item['0']['status'] = $item['0']['status'] == 1 ? '<div data-stock="'.$item['0']['status'].'" id="stock" class="properties properties_presence ">'.$this->languages->getTranslation()->_("in_stock").'</div>' : ($item['0']['status'] == 2 ? '<div data-stock="'.$item['0']['status'].'" id="stock" class="properties properties_absent">'.$this->languages->getTranslation()->_("znyt").'</div>' : '<div data-stock="'.$item['0']['status'].'" id="stock" class="properties properties_absent">'.$this->languages->getTranslation()->_("missing").'</div>');
1062 1077 $item['0']['image'] = '';
1063   -
1064   -
  1078 +
  1079 +
1065 1080 $item['0']['image'] .=
1066 1081 '<li class="float width_400">'.
1067 1082 '<a href="'.$this->storage->getPhotoUrl( $item['0']['cover'], 'avatar', '400x' ).'" title="'.$item['0']['title'].'" data-options="thumbnail: \''.$this->storage->getPhotoUrl( $item['0']['cover'], 'avatar', '800x' ).'\'" class="thumbnail">'.
1068 1083 '<img src="'.$this->storage->getPhotoUrl( $item['0']['cover'], 'avatar', '400x' ).'" alt="'.$item['0']['title'].'" class="image_400">'.
1069 1084 '</a>'.
1070 1085 '</li>';
1071   -
  1086 +
1072 1087 if( !empty( $item['0']['images'] ) && !empty( $item['0']['cover'] ) )
1073 1088 {
1074 1089 foreach( $item['0']['images'] as $k => $i )
1075 1090 {
1076   -
  1091 +
1077 1092 $item['0']['image'] .=
1078 1093 '<li class="float width_128 '.($k%3==0 ? 'last' : '').'">'.
1079 1094 '<a href="'.$this->storage->getPhotoUrl( $i, 'group', '800x' ).'" title="'.$item['0']['title'].'" data-options="thumbnail: \''.$this->storage->getPhotoUrl( $i, 'group', '128x128' ).'\'" class="thumbnail">'.
1080 1095 '<img src="'.$this->storage->getPhotoUrl( $i, 'group', '128x128' ).'" alt="'.$item['0']['title'].'" class="image_128">'.
1081 1096 '</a>'.
1082 1097 '</li>';
1083   -
  1098 +
1084 1099 }
1085   -
  1100 +
1086 1101 $item['0']['image'] .=
1087 1102 '<li class="float width_128 '.(count($item['0']['images'])%3==0 ? 'last' : '').'">'.
1088 1103 '<a href="'.$this->storage->getPhotoUrl( $item['0']['cover'], 'avatar', '800x' ).'" title="'.$item['0']['title'].'" data-options="thumbnail: \''.$this->storage->getPhotoUrl( $item['0']['cover'], 'avatar', '128x' ).'\'" class="thumbnail">'.
... ... @@ -1090,9 +1105,9 @@
1090 1105 '</a>'.
1091 1106 '</li>';
1092 1107 }
1093   -
  1108 +
1094 1109 }
1095   -
  1110 +
1096 1111 if($this->session->get('special_users_id') != null) {
1097 1112 $special_users_id = $this->session->get('special_users_id');
1098 1113  
... ... @@ -1107,6 +1122,7 @@
1107 1122 ]);
1108 1123 }
1109 1124  
  1125 + //discount
1110 1126 $discount = $this->models->getDiscount()->getActiveData();
1111 1127 if (!empty($discount)) {
1112 1128 $discount = $discount[0];
... ... @@ -1119,12 +1135,17 @@
1119 1135 else {
1120 1136 $discount = 0;
1121 1137 }
  1138 + } else {
  1139 + $discount = 0;
1122 1140 }
  1141 + //vip
  1142 + $users_group_id = $this->session->get('users_group_id');
1123 1143  
1124 1144 $this->view->pick('page/changeWithSize');
1125 1145 $this->view->setVars([
1126   - 'item' => $item['0'],
1127   - 'discount' => $discount
  1146 + 'item' => $item['0'],
  1147 + 'discount' => $discount,
  1148 + 'users_group_id' => $users_group_id
1128 1149 ]);
1129 1150 $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
1130 1151 }
... ... @@ -1595,4 +1616,4 @@
1595 1616 header(!empty($language) ? "Location:".$language : 'Location:/');
1596 1617 }
1597 1618  
1598   - }
  1619 + }
... ...
src/app/frontend/messages/ru.php
  Show/Hide comments   View file @2170fea
... ... @@ -164,7 +164,7 @@ return array(
164 164 "sort_alphabetically" => "по алфавиту",
165 165 "new_items" => "Новинки",
166 166 "truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">БЕСПЛАТНАЯ ДОСТАВКА</span><br />
167   - при заказе <span style="color:#f38027;">свыше 500 грн.</span><br />
  167 + при заказе <span style="color:#f38027;">свыше 700 грн.</span><br />
168 168 <a href="http://semena.in.ua/dostavka_i_oplata-2/ru/" style="font-weight:normal;">подробнее о доставке</a>',
169 169 "prof_tips"=>"Советы специалистов",
170 170 "news-actions"=>"Новости / Акции",
... ...
src/app/frontend/messages/ua.php
  Show/Hide comments   View file @2170fea
... ... @@ -184,7 +184,7 @@ return array(
184 184 "new_address_twelve" => 'ст. м. Героїв Дніпра вул. Північна, 6В біля магазину "Сільпо"',
185 185 "new_items" => "Новинки",
186 186 "truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">Безкоштовна доставка</span><br />
187   - при замовленні <span style="color:#f38027;">понад 500 грн.</span><br />
  187 + при замовленні <span style="color:#f38027;">понад 700 грн.</span><br />
188 188 <a href="http://semena.in.ua/dostavka_i_oplata-2" style="font-weight:normal;">детальніше про доставку</a>',
189 189 "prof_tips"=>"Поради професіоналів",
190 190 "news-actions"=>"Новини / Акції",
... ...
src/app/frontend/views/basket_ru.php
  Show/Hide comments   View file @2170fea
... ... @@ -831,7 +831,25 @@ else
831 831  
832 832 <!-- Latest compiled and minified JavaScript -->
833 833 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
834   -
  834 +<script>
  835 + var str = location.href;
  836 + var tag = str.split('#')[1];
  837 + if(tag == "b1"){
  838 + $("#block_4").show();
  839 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  840 + $("#basket_1").show();
  841 + }
  842 + if(tag == "b2"){
  843 + $("#block_4").show();
  844 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  845 + $("#basket_2").show();
  846 + }
  847 + if(tag == "b3"){
  848 + $("#block_4").show();
  849 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  850 + $("#basket_3").show();
  851 + }
  852 +</script>
835 853 <?php
836 854 $url = 'http://api.crm.semena.in.ua/';
837 855 $pbKey = 'e2c4edf8698208c4586fdbcddb0195a5';
... ...
src/app/frontend/views/basket_ua.php
  Show/Hide comments   View file @2170fea
... ... @@ -625,7 +625,7 @@ else
625 625 <div class="col-sm-7 text-center">
626 626 <div class="h4">У «Огірковий кошик» входять:</div>
627 627 <p class="text-left">
628   - Огірок бджолозапильний Аккорд F1, фасовка 20 шт – 1 уп.<br>
  628 + Огірок бджолозапильний Акорд F1, фасовка 20 шт – 1 уп.<br>
629 629 Огірок бджолозапильний Гектор F1, фасовка 20 шт – 1 уп.<br>
630 630 Огірок бджолозапильний Салім F1, фасовка 20 шт – 1 уп.<br>
631 631 Огірок самозапильний Аристократ F1, фасовка 10 шт – 1 уп.<br>
... ... @@ -831,6 +831,25 @@ else
831 831 $url = 'http://api.crm.semena.in.ua/';
832 832 $pbKey = 'e2c4edf8698208c4586fdbcddb0195a5';
833 833 ?>
  834 +<script>
  835 + var str = location.href;
  836 + var tag = str.split('#')[1];
  837 + if(tag == "b1"){
  838 + $("#block_4").show();
  839 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  840 + $("#basket_1").show();
  841 + }
  842 + if(tag == "b2"){
  843 + $("#block_4").show();
  844 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  845 + $("#basket_2").show();
  846 + }
  847 + if(tag == "b3"){
  848 + $("#block_4").show();
  849 + $('html, body').animate({ scrollTop: $("#block_4").offset().top }, 500);
  850 + $("#basket_3").show();
  851 + }
  852 +</script>
834 853 <script type=text/javascript>
835 854 function status_api($value){
836 855 $("#form_voting").hide();
... ...
src/app/frontend/views/customer/cabinet.php
  Show/Hide comments   View file @2170fea
... ... @@ -19,6 +19,7 @@
19 19 <div id="sidebar" class="float">
20 20 <div class="subcategory_sidebar_title">
21 21 <h3><?= $t->_("personal_account") ?></h3>
  22 + <?php if($customer['users_group_id'] == 37) echo '<img class="vip_icon" src="/images/icon_vip_01.png" alt="vip" />'; ?>
22 23 <a href="<?= $this->seoUrl->setUrl($this->url->get([ 'for' => 'cabinet' ])) ?>" title="<?= $t->_("profile") ?>" class="active"><?= $t->_("profile") ?></a>
23 24 <a href="<?= $this->seoUrl->setUrl($this->url->get([ 'for' => 'cabinet_email_settings' ])) ?>" title="<?= $t->_("email_settings") ?>"><?= $t->_("email_settings") ?></a>
24 25 <?php
... ...
src/app/frontend/views/landing_ukr.php
  Show/Hide comments   View file @2170fea
... ... @@ -192,7 +192,7 @@
192 192 <div id="img-pre3"><img src="/landing_semena/images2/pic-8.png" /></div>
193 193 </div>
194 194 <div class="one_item_title">
195   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_parkovyy_1c2-89/ru" title="">
  195 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_parkoviy_1c-89" title="">
196 196 <h3>Газон Парковий</h3>
197 197 </a>
198 198 </div>
... ... @@ -218,7 +218,7 @@
218 218 </div>
219 219 </div>
220 220 <div class="one_item_image">
221   - <a href="#" title="">
  221 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_posukhostiykiy_1c-90" title="">
222 222 <img src="http://storage.semena.in.ua/avatar/6/0/3/e/603eb6277e041cd98e6f3f8525223971/200x.jpg " title="" alt="" width="126" height="200">
223 223 </a>
224 224 <div id="img-pre1"><img src="/landing_semena/images2/pic-3.png" /></div>
... ... @@ -250,7 +250,7 @@
250 250  
251 251 </div>
252 252 <div class="one_item_image">
253   - <a href="#" title="">
  253 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_universalniy_1c-87" title="">
254 254 <img src="http://storage.semena.in.ua/avatar/4/3/7/8/43786eb20ef3e65f98c0438077ba53a9/200x.jpg" title="" width="126" height="200">
255 255 </a>
256 256 <div id="img-pre1"><img src="/landing_semena/images2/pic-3.png" /></div>
... ... @@ -258,7 +258,7 @@
258 258 <div id="img-pre3"><img src="/landing_semena/images2/pic-10.png" /></div>
259 259 </div>
260 260 <div class="one_item_title">
261   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_universalnyy_1c2-87/ru" title="">
  261 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_universalniy_1c-87" title="">
262 262 <h3>Газон Універсальний</h3>
263 263 </a>
264 264 </div>
... ... @@ -284,14 +284,14 @@
284 284 </div>
285 285 </div>
286 286 <div class="one_item_image">
287   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_sportivnyy_1c2-91/ru" title="">
  287 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_sportivniy_1c-91" title="">
288 288 <img src="http://storage.semena.in.ua/avatar/c/4/1/c/c41c6dd11fee9880588b05088bc67676/200x.jpg" title="" alt="" width="126" height="200">
289 289 </a>
290 290 <div id="img-pre1"><img src="/landing_semena/images2/pic-10.png" /></div>
291 291 <div id="img-pre2"><img src="/landing_semena/images2/pic-8.png" /></div>
292 292 </div>
293 293 <div class="one_item_title">
294   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_sportivnyy_1c2-91/ru" title="">
  294 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_sportivniy_1c-91" title="">
295 295 <h3>Газон Спортивний</h3>
296 296 </a>
297 297 </div>
... ... @@ -317,13 +317,13 @@
317 317 </div>
318 318 </div>
319 319 <div class="one_item_image">
320   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_dyuymovochka_1c2-52/ru" title="">
  320 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_dyuymovochka_1c-52" title="">
321 321 <img src="http://storage.semena.in.ua/avatar/2/a/2/a/2a2a230487a81740577024decee3a276/200x.jpg" title="" alt="" width="126" height="200">
322 322 </a>
323 323 <div id="img-pre1"><img src="/landing_semena/images2/pic-5.png" /></div>
324 324 </div>
325 325 <div class="one_item_title">
326   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_dyuymovochka_1c2-52/ru" title="">
  326 + <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_dyuymovochka_1c-52" title="">
327 327 <h3>Газон Дюймовочка</h3>
328 328 </a>
329 329 </div>
... ... @@ -934,4 +934,4 @@
934 934 </div>
935 935 <script src="/dist/js/cart.js"></script>
936 936 </body>
937   -</html>
  937 +</html>
938 938 \ No newline at end of file
... ...
src/app/frontend/views/page/changeWithSize.php
  Show/Hide comments   View file @2170fea
1 1 <?php
  2 +
2 3 if(isset($special_user)) {
3 4 $data['price'] = number_format(isset($item['prices'][$special_user['status']])
4 5 ? $item['prices'][$special_user['status']]
... ... @@ -6,6 +7,13 @@ if(isset($special_user)) {
6 7 } else {
7 8 $data['price'] = $item['price2'];
8 9 }
  10 +
  11 +//vip
  12 +if (isset($users_group_id) && $users_group_id == 37) {
  13 + $data['price'] = round($data['price']*0.95, 1);
  14 +}
  15 +
  16 +//discount
9 17 $old_price = $data['price'];
10 18 $data['price'] = $data['price']*(1-$discount/100);
11 19 $data['price'] = number_format($data['price'], 2, '.', ' ');
... ...
src/app/frontend/views/page/item.php
  Show/Hide comments   View file @2170fea
... ... @@ -203,20 +203,23 @@
203 203 <ul>
204 204 <li>
205 205 <?php
  206 + //vip
  207 + if (isset($users_group_id) && $users_group_id == 37) {
  208 + $item['price2'] = round($item['price2']*0.95, 1);
  209 + }
206 210 // скидка
207 211 if (!empty($discount)) {
208 212 if (isset($discount) && $discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item['id'], $discount['group_ids'])) {
209 213 echo '<span itemprop="price">'.number_format($item['price2']*(1-$discount['discount']/100), 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
210 214 }
211 215 else {
212   - //echo '<span itemprop="price">'.number_format($item['price2'], 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
  216 + echo '<span itemprop="price">'.number_format($item['price2'], 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
213 217 }
214 218 }
215 219 else {
216 220 echo '<span itemprop="price">'.number_format($item['price2'], 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
217 221 }
218 222 ?>
219   - <!--<span itemprop="price"><?//= number_format($item['price2'], 2, '.', ' '); ?></span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>-->
220 223 <div style="display: none" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
221 224 <span itemprop="ratingValue">5</span>
222 225 <span itemprop="reviewCount">31</span>
... ...
src/app/frontend/views/partial/dealer.php
  Show/Hide comments   View file @2170fea
... ... @@ -170,7 +170,10 @@
170 170 <p><?= !empty( $customer['name'] ) ? $customer['name'] : 'User' ?></p>
171 171 <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
172 172 </div>
173   -
  173 + <?php //vip icon
  174 + if (isset($customer['users_group_id']) && $customer['users_group_id'] == 37)
  175 + echo '<div class="dealer_vip_icon"><img src="/images/icon_vip_01.png" alt="vip"/></div>';
  176 + ?>
174 177 </div>
175 178  
176 179 <!-- sidebar menu: : style can be found in sidebar.less -->
... ...
src/app/frontend/views/partial/item_group.php
  Show/Hide comments   View file @2170fea
... ... @@ -34,6 +34,10 @@
34 34 <div class="one_item_price">
35 35 <?= $t->_("price_from") ?>
36 36 <?php
  37 + //vip
  38 + if(isset($users_group_id) && $users_group_id == '37') {
  39 + $i['price'] = round($i['price']*0.95, 1);
  40 + }
37 41 // скидка
38 42 if (!empty($discount)) {
39 43 if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($i['id'], $discount['group_ids'])) {
... ...
src/lib/common.php
  Show/Hide comments   View file @2170fea
... ... @@ -1335,6 +1335,18 @@ namespace
1335 1335 public function parseArray($str) {
1336 1336 return explode(',', preg_replace('[{|}]', '' , $str));
1337 1337 }
  1338 +
  1339 + public function applyDiscount($discount_value, &$items) {
  1340 + if (empty($discount_value) || $discount_value < 0 || $discount_value > 100) {
  1341 + return false;
  1342 + }
  1343 + foreach($items as $k => $item) {
  1344 + $items[$k]['price2'] = number_format($item['price2'] - ($item['price2'] * $discount_value / 100), 1, '.', '');
  1345 + $items[$k]['total_price'] = number_format($items[$k]['price2'] * $item['count'], 1, '.', '');
  1346 + }
  1347 + return true;
  1348 + }
  1349 +
1338 1350 }
1339 1351 }
1340 1352  
... ...
src/lib/models/customers.php
  Show/Hide comments   View file @2170fea
... ... @@ -29,7 +29,8 @@ class customers extends \db
29 29 SELECT * FROM
30 30 public.customers
31 31 WHERE
32   - email LIKE \'%'.$like.'%\''
  32 + email LIKE \'%'.$like.'%\'
  33 + '
33 34 ,
34 35 [
35 36 ],
... ... @@ -43,7 +44,8 @@ class customers extends \db
43 44 SELECT * FROM
44 45 public.customers
45 46 WHERE
46   - status = 1'
  47 + status = 1
  48 + '
47 49 ,
48 50 [
49 51 ],
... ... @@ -72,7 +74,7 @@ class customers extends \db
72 74 SELECT * FROM
73 75 public.customers
74 76 ORDER BY
75   - id ASC
  77 + id DESC
76 78 LIMIT
77 79 '.\config::get( 'limits/admin_orders' ).'
78 80 OFFSET
... ... @@ -204,9 +206,9 @@ class customers extends \db
204 206  
205 207 public function UpdateData($data,$id)
206 208 {
207   -
208   - return $this->exec(
209   - '
  209 + if (!empty($data['password'])) {
  210 + return $this->exec(
  211 + '
210 212 UPDATE
211 213 public.customers
212 214 SET
... ... @@ -227,24 +229,66 @@ class customers extends \db
227 229 WHERE
228 230 id = :id
229 231 ',
230   - [
231   - 'name' => $data['name'],
232   - 'email' => $data['email'],
233   - 'password' => $data['password'],
234   - 'birth_date' => empty($data['birth_date']) ? null : $data['birth_date'],
235   - 'phone' => $data['phone'],
236   - 'city' => $data['city'],
237   - 'address' => $data['address'],
238   - 'delivery' => $data['delivery'],
239   - 'pay' => $data['pay'],
240   - 'subscribed' => $data['subscribed'],
241   - 'comments' => $data['comments'],
242   - 'status' => $data['status'],
243   - 'users_group_id' => $data['users_group_id'],
244   - 'special_users_id' => $data['special_users_id'],
245   - "id" => $id
246   - ]
247   - );
  232 + [
  233 + 'name' => $data['name'],
  234 + 'email' => $data['email'],
  235 + 'password' => $data['password'],
  236 + 'birth_date' => empty($data['birth_date']) ? null : $data['birth_date'],
  237 + 'phone' => $data['phone'],
  238 + 'city' => $data['city'],
  239 + 'address' => $data['address'],
  240 + 'delivery' => $data['delivery'],
  241 + 'pay' => $data['pay'],
  242 + 'subscribed' => $data['subscribed'],
  243 + 'comments' => $data['comments'],
  244 + 'status' => $data['status'],
  245 + 'users_group_id' => $data['users_group_id'],
  246 + 'special_users_id' => $data['special_users_id'] == 7 ? null : $data['special_users_id'],
  247 + "id" => $id
  248 + ]
  249 + );
  250 + }
  251 + else {
  252 + return $this->exec(
  253 + '
  254 + UPDATE
  255 + public.customers
  256 + SET
  257 + name = :name,
  258 + email = :email,
  259 + birth_date = :birth_date,
  260 + phone = :phone,
  261 + city = :city,
  262 + address = :address,
  263 + delivery = :delivery,
  264 + pay = :pay,
  265 + subscribed = :subscribed,
  266 + comments = :comments,
  267 + status = :status,
  268 + users_group_id = :users_group_id,
  269 + special_users_id = :special_users_id
  270 + WHERE
  271 + id = :id
  272 + ',
  273 + [
  274 + 'name' => $data['name'],
  275 + 'email' => $data['email'],
  276 + 'birth_date' => empty($data['birth_date']) ? null : $data['birth_date'],
  277 + 'phone' => $data['phone'],
  278 + 'city' => $data['city'],
  279 + 'address' => $data['address'],
  280 + 'delivery' => $data['delivery'],
  281 + 'pay' => $data['pay'],
  282 + 'subscribed' => $data['subscribed'],
  283 + 'comments' => $data['comments'],
  284 + 'status' => $data['status'],
  285 + 'users_group_id' => $data['users_group_id'],
  286 + 'special_users_id' => $data['special_users_id'] == 7 ? null : $data['special_users_id'],
  287 + "id" => $id
  288 + ]
  289 + );
  290 + }
  291 +
248 292 }
249 293  
250 294  
... ... @@ -632,9 +676,9 @@ class customers extends \db
632 676 }
633 677 public function editCustomer( $customer_edit )
634 678 {
635   -
636   - return $this->exec(
637   - '
  679 + if (!empty($customer_edit['users_group_id'])) {
  680 + return $this->exec(
  681 + '
638 682 UPDATE
639 683 public.customers
640 684 SET
... ... @@ -652,19 +696,50 @@ class customers extends \db
652 696 WHERE
653 697 id=:id
654 698 ',
655   - [
656   - 'name' => $customer_edit['name'],
657   - 'passwd' => $customer_edit['passwd'],
658   - 'email' => $customer_edit['email'],
659   - 'birth_date' => $customer_edit['birth_date'],
660   - 'phone' => $customer_edit['phone'],
661   - 'city' => $customer_edit['city'],
662   - 'address' => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
663   - 'subscribed' => $customer_edit['subscribed'],
664   - 'id' => $customer_edit['id'],
665   - 'users_group_id'=> !empty($customer_edit['users_group_id']) ? $customer_edit['users_group_id'] : null
666   - ]
667   - );
  699 + [
  700 + 'name' => $customer_edit['name'],
  701 + 'passwd' => $customer_edit['passwd'],
  702 + 'email' => $customer_edit['email'],
  703 + 'birth_date' => $customer_edit['birth_date'],
  704 + 'phone' => $customer_edit['phone'],
  705 + 'city' => $customer_edit['city'],
  706 + 'address' => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
  707 + 'subscribed' => $customer_edit['subscribed'],
  708 + 'id' => $customer_edit['id'],
  709 + 'users_group_id'=> !empty($customer_edit['users_group_id']) ? $customer_edit['users_group_id'] : null
  710 + ]
  711 + );
  712 + }
  713 + else {
  714 + return $this->exec(
  715 + '
  716 + UPDATE
  717 + public.customers
  718 + SET
  719 + name = :name,
  720 + passwd = :passwd,
  721 + email = :email,
  722 + birth_date = :birth_date,
  723 + phone = :phone,
  724 + city = :city,
  725 + address = :address,
  726 + subscribed = :subscribed
  727 + WHERE
  728 + id=:id
  729 + ',
  730 + [
  731 + 'name' => $customer_edit['name'],
  732 + 'passwd' => $customer_edit['passwd'],
  733 + 'email' => $customer_edit['email'],
  734 + 'birth_date' => $customer_edit['birth_date'],
  735 + 'phone' => $customer_edit['phone'],
  736 + 'city' => $customer_edit['city'],
  737 + 'address' => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
  738 + 'subscribed' => $customer_edit['subscribed'],
  739 + 'id' => $customer_edit['id']
  740 + ]
  741 + );
  742 + }
668 743 }
669 744  
670 745 /////////////////////////////////////////////////////////////////////////////
... ...
www-arktika/list.php
  Show/Hide comments   View file @2170fea
... ... @@ -13,29 +13,29 @@
13 13 <td bgcolor="#67b73e" width="100%" height="30" align="center" valign="top">
14 14 <table border="0" cellpadding="0" cellspacing="0" width="660">
15 15 <tr>
16   - <td align="left" valign="middle" height="30"><a href="http://semena.in.ua/news-actions" style="color:white;font-family:Calibri;font-size:13px;font-style:Italic;">Заманчивые предложения</a></td>
  16 + <td align="left" valign="middle" height="30"><a href="http://semena.in.ua/news-actions?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="color:white;font-family:Calibri;font-size:13px;font-style:Italic;">Заманчивые предложения</a></td>
17 17 <td align="right" valign="middle" height="30"><a href="#" style="color:white;font-family:Calibri;font-size:13px;font-style:Italic;">Загрузить картинки</a></td>
18 18 </tr>
19 19 </table>
20 20 </td>
21 21 </tr>
22 22 <tr>
23   - <td align="center" valign="top" style="background: url('list_images/fon_header.png');background-repeat-y: no-repeat;">
  23 + <td align="center" valign="top" style="background: url('images/fon_header.png');background-repeat-y: no-repeat;">
24 24 <table border="0" cellpadding="0" cellspacing="0" width="660" height="157">
25 25 <tr>
26 26 <td align="center" valign="top">
27 27 <table border="0" cellpadding="0" cellspacing="0" width="660">
28 28 <tr><td height="23" valign="top"></td></tr>
29 29 <tr>
30   - <td width="203px" height="70" align="left" background="list_images/logo.png" style="background-position:left 10px;background-repeat:no-repeat;" valign="top"><a href="http://semena.in.ua" target="_blank" style="border:none;"><img src="list_images/link.png" border="none" height="50" width="174"></a></td>
31   - <td width="308" align="center" height="70" background="list_images/tel_all.png" style="background-position-y: 7px;background-repeat:no-repeat;"></td>
  30 + <td width="203px" height="70" align="left" background="images/logo.png" style="background-position:left 10px;background-repeat:no-repeat;" valign="top"><a href="http://semena.in.ua?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="border:none;"><img src="images/link.png" border="none" height="50" width="174"></a></td>
  31 + <td width="308" align="center" height="70" background="images/tel_all.png" style="background-position-y: 7px;background-repeat:no-repeat;"></td>
32 32 <td align="right" valign="top">
33 33 <table border="0" cellpadding="0" cellspacing="0">
34 34 <tr>
35   - <td background="list_images/ico-6.png" height="26" style="background-repeat:no-repeat;background-position: left 7px;padding-left: 20px;"><a href="http://semena.in.ua/callback/ru" style="color:#4a4a4a;font-size:13px;font-family:Calibri;font-style:italic;">Обратная связь</a></td>
  35 + <td background="images/ico-6.png" height="26" style="background-repeat:no-repeat;background-position: left 7px;padding-left: 20px;"><a href="http://semena.in.ua/callback/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="color:#4a4a4a;font-size:13px;font-family:Calibri;font-style:italic;">Обратная связь</a></td>
36 36 </tr>
37 37 <tr>
38   - <td background="list_images/ico-7.png" height="26" style="background-repeat:no-repeat;background-position: left 8px;padding-left: 20px;"><a href="http://semena.in.ua/video/ru" style="color:#4a4a4a;font-size:13px;font-family:Calibri;font-style:italic;">Видеообзоры</a></td>
  38 + <td background="images/ico-7.png" height="26" style="background-repeat:no-repeat;background-position: left 8px;padding-left: 20px;"><a href="http://semena.in.ua/video/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="color:#4a4a4a;font-size:13px;font-family:Calibri;font-style:italic;">Видеообзоры</a></td>
39 39 </tr>
40 40 </table>
41 41 </td>
... ... @@ -48,11 +48,11 @@
48 48 <td align="center">
49 49 <table border="0" cellpadding="0" cellspacing="0">
50 50 <tr>
51   - <td background="list_images/menu01.png" width="142" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/o-kompanii-1/ru" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">О КОМПАНИИ</a>
  51 + <td background="images/menu01.png" width="142" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/o-kompanii-1/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">О КОМПАНИИ</a>
52 52 </td>
53   - <td background="list_images/menu02.png" width="183" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/dostavka-i-oplata-2/ru" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">ДОСТАВКА И ОПЛАТА</a></td>
54   - <td background="list_images/menu03.png" width="96" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/news-actions/ru" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">АКЦИИ</a></td>
55   - <td background="list_images/menu04.png" width="233" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/prof_tips/ru" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">СОВЕТЫ ПРОФЕССИОНАЛОВ</a></td>
  53 + <td background="images/menu02.png" width="183" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/dostavka-i-oplata-2/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">ДОСТАВКА И ОПЛАТА</a></td>
  54 + <td background="images/menu03.png" width="96" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/news-actions/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">АКЦИИ</a></td>
  55 + <td background="images/menu04.png" width="233" height="36" style="background-position:top center; background-repeat:no-repeat;text-align:center;" align="center"><a target="_blank" href="http://semena.in.ua/prof_tips/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" style="font-family: Calibri;text-decoration: none;text-align: center;color: white;font-size: 14px;font-weight: bold;">СОВЕТЫ ПРОФЕССИОНАЛОВ</a></td>
56 56 </tr>
57 57 </table>
58 58 </td>
... ... @@ -65,63 +65,63 @@
65 65 <td align="center">
66 66 <table cellspacing="0" cellpadding="0" border="0" width="660">
67 67 <tr>
68   - <td width="65" height="65" background="list_images/f-1.jpg" style="background-position:center center;background-repeat:no-repeat;">
69   - <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a>
  68 + <td width="65" height="65" background="images/f-1.jpg" style="background-position:center center;background-repeat:no-repeat;">
  69 + <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a>
70 70 </td>
71 71 <td width="20" valign="top"></td>
72   - <td width="65" height="65" background="list_images/f-2.jpg" style="background-position:center center;background-repeat:no-repeat;">
73   - <a href="http://semena.in.ua/semena_tsvetov_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  72 + <td width="65" height="65" background="images/f-2.jpg" style="background-position:center center;background-repeat:no-repeat;">
  73 + <a href="http://semena.in.ua/semena_tsvetov_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
74 74 <td width="20" valign="top"></td>
75   - <td width="65" height="65" background="list_images/f-3.jpg" style="background-position:center center;background-repeat:no-repeat;">
76   - <a href="http://semena.in.ua/udobrenija_i_sredstva_zashchity_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  75 + <td width="65" height="65" background="images/f-3.jpg" style="background-position:center center;background-repeat:no-repeat;">
  76 + <a href="http://semena.in.ua/udobrenija_i_sredstva_zashchity_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
77 77 <td width="20" valign="top"></td>
78   - <td width="65" height="65" background="list_images/f-4.jpg" style="background-position:center center;background-repeat:no-repeat;">
79   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  78 + <td width="65" height="65" background="images/f-4.jpg" style="background-position:center center;background-repeat:no-repeat;">
  79 + <a href="http://semena.in.ua/gazonnye_travy_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
80 80 <td width="20" valign="top"></td>
81   - <td width="65" height="65" background="list_images/f-5.jpg" style="background-position:center center;background-repeat:no-repeat;">
82   - <a href="http://semena.in.ua/sadjenci_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  81 + <td width="65" height="65" background="images/f-5.jpg" style="background-position:center center;background-repeat:no-repeat;">
  82 + <a href="http://semena.in.ua/sadjenci_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
83 83 <td width="20" valign="top"></td>
84   - <td width="65" height="65" background="list_images/f-6.jpg" style="background-position:center center;background-repeat:no-repeat;">
85   - <a href="http://semena.in.ua/tovary_dlja_sada_i_ogoroda_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  84 + <td width="65" height="65" background="images/f-6.jpg" style="background-position:center center;background-repeat:no-repeat;">
  85 + <a href="http://semena.in.ua/tovary_dlja_sada_i_ogoroda_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
86 86 <td width="20" valign="top"></td>
87   - <td width="65" height="65" background="list_images/f-7.jpg" style="background-position:center center;background-repeat:no-repeat;">
88   - <a href="http://semena.in.ua/zootovari_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  87 + <td width="65" height="65" background="images/f-7.jpg" style="background-position:center center;background-repeat:no-repeat;">
  88 + <a href="http://semena.in.ua/zootovari_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
89 89 <td width="20" valign="top"></td>
90   - <td width="65" height="65" background="list_images/f-8.jpg" style="background-position:center center;background-repeat:no-repeat;">
91   - <a href="http://semena.in.ua/biopreparati_1c_20/ru" target="_blank"><img width="65" height="65" valign="top" align="left" src="list_images/link.png" border="none"></a></td>
  90 + <td width="65" height="65" background="images/f-8.jpg" style="background-position:center center;background-repeat:no-repeat;">
  91 + <a href="http://semena.in.ua/biopreparati_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank"><img width="65" height="65" valign="top" align="left" src="images/link.png" border="none"></a></td>
92 92 </tr>
93 93 <tr><td height="10px"></td></tr>
94 94 <tr>
95 95 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#53a726;text-transform:uppercase;">
96   - <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ru" target="_blank" style="text-decoration:none;color:#53a726;">Семена<br>овощей</a>
  96 + <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#53a726;">Семена<br>овощей</a>
97 97 </td>
98 98 <td width="20" valign="top"></td>
99 99 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#b22b2c;text-transform:uppercase;">
100   - <a href="http://semena.in.ua/semena_tsvetov_1c_20/ru" target="_blank" style="text-decoration:none;color:#b22b2c;">Семена<br>цветов</a>
  100 + <a href="http://semena.in.ua/semena_tsvetov_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#b22b2c;">Семена<br>цветов</a>
101 101 </td>
102 102 <td width="20" valign="top"></td>
103 103 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#f36c00;text-transform:uppercase;">
104   - <a href="http://semena.in.ua/udobrenija_i_sredstva_zashchity_1c_20/ru" target="_blank" style="text-decoration:none;color:#f36c00;">Удобрения<br>и средства<br>защиты</a>
  104 + <a href="http://semena.in.ua/udobrenija_i_sredstva_zashchity_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#f36c00;">Удобрения<br>и средства<br>защиты</a>
105 105 </td>
106 106 <td width="20" valign="top"></td>
107 107 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#1b7981;text-transform:uppercase;">
108   - <a href="http://semena.in.ua/gazonnye_travy_1c_20/ru" target="_blank" style="text-decoration:none;color:#1b7981;">Газонные<br>травы</a>
  108 + <a href="http://semena.in.ua/gazonnye_travy_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#1b7981;">Газонные<br>травы</a>
109 109 </td>
110 110 <td width="20" valign="top"></td>
111 111 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#935927;text-transform:uppercase;">
112   - <a href="http://semena.in.ua/sadjenci_1c_20/ru" target="_blank" style="text-decoration:none;color:#935927;">Саженцы</a>
  112 + <a href="http://semena.in.ua/sadjenci_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#935927;">Саженцы</a>
113 113 </td>
114 114 <td width="20" valign="top"></td>
115 115 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#b1873f;text-transform:uppercase;">
116   - <a href="http://semena.in.ua/tovary_dlja_sada_i_ogoroda_1c_20/ru" target="_blank" style="text-decoration:none;color:#b1873f;">Товары<br>для сада<br>и огорода</a>
  116 + <a href="http://semena.in.ua/tovary_dlja_sada_i_ogoroda_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#b1873f;">Товары<br>для сада<br>и огорода</a>
117 117 </td>
118 118 <td width="20" valign="top"></td>
119 119 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#5b4a42;text-transform:uppercase;">
120   - <a href="http://semena.in.ua/zootovari_1c_20/ru" target="_blank" style="text-decoration:none;color:#5b4a42;">Зоотовары</a>
  120 + <a href="http://semena.in.ua/zootovari_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#5b4a42;">Зоотовары</a>
121 121 </td>
122 122 <td width="20" valign="top"></td>
123 123 <td height="50" width="65" valign="top" align="center" style="line-height: 1.3;font-family:Calibri;font-weight:bold;font-size:13px;color:#00a3de;text-transform:uppercase;">
124   - <a href="http://semena.in.ua/biopreparati_1c_20/ru" target="_blank" style="text-decoration:none;color:#00a3de;">Био-препараты</a>
  124 + <a href="http://semena.in.ua/biopreparati_1c_20/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="text-decoration:none;color:#00a3de;">Био-препараты</a>
125 125 </td>
126 126 </tr>
127 127 </table>
... ... @@ -131,11 +131,11 @@
131 131 <tr>
132 132 <td align="center" valign="top" width="100%">
133 133 <table border="0" cellpadding="0" cellspacing="0" width="682">
134   - <tr><td background="list_images/top_white.png" width="100%" height="30" align="center" valign="top">
  134 + <tr><td background="images/top_white.png" width="100%" height="30" align="center" valign="top">
135 135  
136 136 </td></tr>
137 137 <tr>
138   - <td align="center" background="list_images/center_white.png">
  138 + <td align="center" background="images/center_white.png">
139 139  
140 140 <table border="0" cellpadding="0" cellspacing="0" width="620px">
141 141 <tr><td align="center">
... ... @@ -146,14 +146,14 @@
146 146 </tr>
147 147 <tr>
148 148 <td style="color: #333333;font-family: Calibri;font-size: 16px;line-height: 18px;letter-spacing: -0.2px;"><br />
149   - Как и обещали, дарим Вам промокод со скидкой -7% на покупку сверхурожайного и холодостойкого огурца Арктика F1 на <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ogurets_1c_21/arena_f1_ru_1c2-3030/ru" target="_blank" style="color:#00aeef;text-decoration:none;">нашем сайте</a><br /><br />
  149 + Как и обещали, дарим Вам промокод со скидкой -7% на покупку сверхурожайного и холодостойкого огурца Арктика F1 на <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ogurets_1c_21/arena_f1_ru_1c2-3030/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="color:#00aeef;text-decoration:none;">нашем сайте</a><br /><br />
150 150  
151 151 <b>Ваш персональный промокод на скидку: {code} </b><br /><br />
152 152 </td>
153 153 </tr>
154 154 <tr><td align="center" style="text-align:center;">
155 155  
156   - <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ogurets_1c_21/arena_f1_ru_1c2-3030/ru" target="_blank" style="color:#00aeef;text-decoration:none;text-align:center;border:none;"><img src="list_images/buy_but.png"></a></td></tr>
  156 + <a href="http://semena.in.ua/semena_ovoshchey_1c_20/ogurets_1c_21/arena_f1_ru_1c2-3030/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email" target="_blank" style="color:#00aeef;text-decoration:none;text-align:center;border:none;"><img src="images/buy_but.png"></a></td></tr>
157 157 <tr><td style="color: #333333;font-family: Calibri;font-size: 16px;line-height: 18px;letter-spacing: -0.2px;"><br />
158 158 Обратите внимание! Для того, чтобы воспользоваться промокодом, необходимо зарегистрироваться на нашем сайте.<br /><br />Удачных покупок и хорошего урожая!<br /><br />
159 159 </td>
... ... @@ -163,7 +163,7 @@
163 163 </td>
164 164 </tr>
165 165 <tr>
166   - <td background="list_images/bottom_white.png" width="100%" style="background-position: bottom center;background-repeat:no-repeat;" align="center" valign="top">
  166 + <td background="images/bottom_white.png" width="100%" style="background-position: bottom center;background-repeat:no-repeat;" align="center" valign="top">
167 167 <table border="0" cellpadding="0" cellspacing="0" width="620px">
168 168  
169 169 <tr><td height="30px"></td>
... ... @@ -181,7 +181,7 @@
181 181  
182 182 <table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>
183 183 <td>
184   - <table cellpadding="0" cellspacing="0" border="0" width="100%" height="236" background="list_images/bg-2.jpg">
  184 + <table cellpadding="0" cellspacing="0" border="0" width="100%" height="236" background="images/bg-2.jpg">
185 185 <tr>
186 186 <td align="center">
187 187 <table cellspacing="0" border="0" cellpadding="0" width="660">
... ... @@ -189,7 +189,7 @@
189 189 <td>
190 190 <table cellpadding="0" cellspacing="0" border="0" height="236">
191 191 <tr>
192   - <td height="90"><a target="_blank" href="http://semena.in.ua/ru"><img src="list_images/logo.png" border="0" alt="semena.in.ua"></a></td>
  192 + <td height="90"><a target="_blank" href="http://semena.in.ua/ru?utm_source=newsletter&utm_campaign=arktika&utm_medium=email"><img src="images/logo.png" border="0" alt="semena.in.ua"></a></td>
193 193 </tr>
194 194 <tr>
195 195 <td valign="top" height="60" style="color: #4a4a4a; font-size: 15px; font-family: calibri; font-weight: normal;">Адрес центрального офиса:<br>
... ... @@ -199,11 +199,11 @@
199 199 </td>
200 200 <td align="center">
201 201 <table cellspacing="0" cellpadding="0" border="0">
202   - <tr><td background="list_images/tel01.png" width="150" height="29" title="(044) 581-67-15" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
203   - <tr><td background="list_images/tel02.png" width="150" height="29" title="(044) 451-48-59" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
204   - <tr><td background="list_images/tel03.png" width="150" height="29" title="(050) 464-48-49" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
205   - <tr><td background="list_images/tel04.png" width="150" height="29" title="(067) 464-48-59" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
206   - <tr><td background="list_images/tel05.png" width="150" height="29" title="(093) 026-86-64" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
  202 + <tr><td background="images/tel01.png" width="150" height="29" title="(044) 581-67-15" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
  203 + <tr><td background="images/tel02.png" width="150" height="29" title="(044) 451-48-59" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
  204 + <tr><td background="images/tel03.png" width="150" height="29" title="(050) 464-48-49" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
  205 + <tr><td background="images/tel04.png" width="150" height="29" title="(067) 464-48-59" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
  206 + <tr><td background="images/tel05.png" width="150" height="29" title="(093) 026-86-64" style="background-position: top left; background-repeat:no-repeat;"></td></tr>
207 207 </tbody></table>
208 208 </td>
209 209 <td align="right">
... ... @@ -212,9 +212,9 @@
212 212 <td>
213 213 <table cellspacing="0" cellpadding="0" border="0" width="168" style="text-align: right">
214 214 <tr>
215   - <td><a target="_blank" href="https://www.facebook.com/Professionalseeds"><img src="list_images/fb.png" width="48" height="48" border="0" alt=""></a></td>
216   - <td><a target="_blank" href="https://www.youtube.com/channel/UCMnG-NxtoprcTxKcPouwWdQ"><img src="list_images/youtube.png" width="48" height="48" border="0" alt=""></a></td>
217   - <td><a target="_blank" href="https://vk.com/public116774284"><img src="list_images/vk.png" width="48" height="48" border="0" alt=""></a></td>
  215 + <td><a target="_blank" href="https://www.facebook.com/Professionalseeds"><img src="images/fb.png" width="48" height="48" border="0" alt=""></a></td>
  216 + <td><a target="_blank" href="https://www.youtube.com/channel/UCMnG-NxtoprcTxKcPouwWdQ"><img src="images/youtube.png" width="48" height="48" border="0" alt=""></a></td>
  217 + <td><a target="_blank" href="https://vk.com/public116774284"><img src="images/vk.png" width="48" height="48" border="0" alt=""></a></td>
218 218 </tr>
219 219 </tbody></table>
220 220 </td>
... ...
www/css/main.css
  Show/Hide comments   View file @2170fea
... ... @@ -1154,6 +1154,10 @@ h2.types_logo_479 {
1154 1154 font: bold 13px/15px Arial, Tahoma, sans-serif;
1155 1155 margin: 15px 0 10px 0;
1156 1156 }
  1157 + .subcategory_sidebar_title .vip_icon {
  1158 + float: right;
  1159 + margin-left: 20px;
  1160 + }
1157 1161  
1158 1162 ul#subcategory_menu {
1159 1163 width: 220px;
... ...
www/css/main.min.css
  Show/Hide comments   View file @2170fea
... ... @@ -286,6 +286,7 @@ h2.types_logo_479{color:#b1873f;}
286 286 .item .content_accost{background:#f5f5f5;padding:0 0 40px 0;position:relative;border-bottom:0;}
287 287 .subcategory_sidebar_title h3{font:bold 16px/18px Arial, Tahoma, sans-serif;color:#4fa32c;}
288 288 .subcategory_sidebar_title p{font:bold 13px/15px Arial, Tahoma, sans-serif;margin:15px 0 10px 0;}
  289 +.subcategory_sidebar_title .vip_icon{margin-left:20px; float:right;}
289 290 ul#subcategory_menu{width:220px;list-style:none;}
290 291 ul.last{border-bottom:1px solid #e3e3e3;}
291 292 ul#subcategory_menu li .main{text-shadow:0 1px 0 rgba(255, 255, 255, 0.8);cursor:pointer;margin:0;padding:6px 0 6px 10px;background:#fefefe;background:-moz-linear-gradient(top, #fefefe 0%, #1e5799 0%, #fefefe 0%, #ededed 100%, #ededed 100%);background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#fefefe), color-stop(0%,#1e5799), color-stop(0%,#fefefe), color-stop(100%,#ededed), color-stop(100%,#ededed));background:-webkit-linear-gradient(top, #fefefe 0%,#1e5799 0%,#fefefe 0%,#ededed 100%,#ededed 100%);background:-o-linear-gradient(top, #fefefe 0%,#1e5799 0%,#fefefe 0%,#ededed 100%,#ededed 100%);background:-ms-linear-gradient(top, #fefefe 0%,#1e5799 0%,#fefefe 0%,#ededed 100%,#ededed 100%);background:linear-gradient(to bottom, #fefefe 0%,#1e5799 0%,#fefefe 0%,#ededed 100%,#ededed 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#ededed',GradientType=0);border:1px solid #e0e0e0;text-decoration:none;font:bold 13px/16px Arial, Tahoma, sans-serif;display:block;}
... ...
www/dist/css/AdminLTE.css
  Show/Hide comments   View file @2170fea
... ... @@ -451,6 +451,9 @@ h6,
451 451 padding: 10px;
452 452 overflow: hidden;
453 453 }
  454 +.user-panel .dealer_vip_icon{
  455 + float:right;
  456 +}
454 457 .user-panel:before,
455 458 .user-panel:after {
456 459 content: " ";
... ...
www/dist/css/AdminLTE.min.css
  Show/Hide comments   View file @2170fea
... ... @@ -102,6 +102,7 @@ h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:&#39;Source Sans Pro&#39;,sans-ser
102 102 .user-panel{position:relative;width:100%;padding:10px;overflow:hidden}
103 103 .user-panel:before,.user-panel:after{content:" ";display:table}
104 104 .user-panel:after{clear:both}
  105 +.user-panel .dealer_vip_icon{float:right}
105 106 .user-panel > .image > img{width:100%;max-width:45px;height:auto}
106 107 .user-panel > .info{padding:5px 5px 5px 15px;line-height:1;position:absolute;left:55px}
107 108 .user-panel > .info > p{font-weight:600;margin-bottom:9px}
... ...
www/images/green_16.jpg 0 → 100644
View file @2170fea

12.3 KB
www/images/icon_vip_01.png 0 → 100644
View file @2170fea

2.33 KB
www/images/red_16.png 0 → 100644
View file @2170fea

160 Bytes
www/test.txt
  Show/Hide comments   View file @2170fea
1 1 testTest
2   -SSHvgg
3 2 \ No newline at end of file
  3 +SSHvgg
... ...