Alex Savenko / linija-svitla

Commit d09f430fc857e834f2c5135cdf2ed5fbea7f2eac

Authored by Administrator
1 parent a46c643b

big commti

Showing 29 changed files with 978 additions and 1386 deletions   Show diff stats
Inline Side-by-side
backend/views/category/_form.php
  Show/Hide comments   View file @d09f430
... ... @@ -30,7 +30,7 @@ use kartik\select2\Select2;
30 30 ]
31 31 ])->label(Yii::t('product', 'Parent category')) ?>
32 32  
33   - <?= $form->field($model, 'group_to_category')->widget(Select2::className(), [
  33 + <?= $form->field($model, 'categories')->widget(Select2::className(), [
34 34 'data' => \yii\helpers\ArrayHelper::map(\common\modules\rubrication\models\TaxGroup::find()->all(), 'tax_group_id', 'name'),
35 35 'language' => 'ru',
36 36 'options' => [
... ...
common/config/main.php
  Show/Hide comments   View file @d09f430
... ... @@ -68,7 +68,7 @@ return [
68 68 'master' => null
69 69 ],
70 70 ],
71   - 'product_trumb2' => [
  71 + 'product_trumb' => [
72 72 'resize' => [
73 73 'width' => 88,
74 74 'height' => 88,
... ...
common/models/Basket.php
  Show/Hide comments   View file @d09f430
... ... @@ -113,17 +113,5 @@
113 113 ->all();
114 114 }
115 115  
116   - public function getModal(): string
117   - {
118   - $output = '';
119   - $data = $this->getData();
120   - $models = $this->findModels(array_keys($this->getData()));
121   - if(!empty( $models )) {
122   - $output = \Yii::$app->view->renderFile('@frontend/views/basket/modal_items.php', [
123   - 'models' => $models,
124   - 'basket' => $this,
125   - ]);
126   - }
127   - return $output;
128   - }
  116 +
129 117 }
130 118 \ No newline at end of file
... ...
common/models/Orders.php
  Show/Hide comments   View file @d09f430
... ... @@ -16,8 +16,8 @@ class Orders extends \yii\db\ActiveRecord
16 16 public function rules()
17 17 {
18 18 return [
19   - [['name', 'phone'], 'required','whenClient' => true],
20   - [['total','body','email','phone2','delivery','payment','adress','city'], 'safe'],
  19 + [['name', 'phone'], 'required'],
  20 + [['comment'], 'safe'],
21 21 [['email'],'email'],
22 22 ];
23 23 }
... ... @@ -26,17 +26,9 @@ class Orders extends \yii\db\ActiveRecord
26 26 {
27 27 return [
28 28 'name' => 'ะค.ะ˜.ะž',
29   - 'phone'=>'ะขะตะปะตั„ะพะฝ',
30   - 'phone2'=>'ะ”ะพะฟ. ะขะตะป.',
31   - 'body'=>'ะกะพะพะฑั‰ะตะฝะธะต',
32   - 'adress'=>'ะะดั€ะตั',
33   - 'city'=>'ะ“ะพั€ะพะด',
34   - 'email'=>'E-mail',
35   - 'date_time'=>'ะ”ะฐั‚ะฐ',
36   - 'total'=>'ะกัƒะผะฐ',
37   - 'status'=>'ะกั‚ะฐั‚ัƒั',
38   - 'delivery'=>'ะ’ะฐั€ะธะฐะฝั‚ ะดะพัั‚ะฐะฒะบะธ',
39   - 'payment'=>'ะกะฟะพัะพะฑั‹ ะพะฟะปะฐั‚ั‹',
  29 + 'phone'=>'ะšะพะฝั‚ะฐะบั‚ะฝั‹ะน ั‚ะตะปะตั„ะพะฝ',
  30 + 'email'=>'email',
  31 + 'comment'=>'ะšะพะผะผะตะฝั‚ะฐั€ะธะธ',
40 32 ];
41 33 }
42 34  
... ...
common/modules/product/models/Category.php
  Show/Hide comments   View file @d09f430
... ... @@ -135,8 +135,8 @@ class Category extends \yii\db\ActiveRecord
135 135  
136 136 public function getTaxGroupsByLevel($level)
137 137 {
138   - return $this->hasMany(TaxGroup::className(), ['tax_group_id' => 'entity1_id'])
139   - ->viaTable('relation', ['entity2_id' => 'category_id'])
  138 + return $this->hasMany(TaxGroup::className(), ['tax_group_id' => 'tax_group_id'])
  139 + ->viaTable('tax_group_to_category', ['category_id' => 'category_id'])
140 140 ->andWhere(['level' => $level]);
141 141 }
142 142  
... ... @@ -261,4 +261,10 @@ class Category extends \yii\db\ActiveRecord
261 261  
262 262  
263 263 }
  264 +
  265 + public function getTaxGroup()
  266 + {
  267 + return $this->hasMany(TaxGroup::className(), ['tax_group_id' => 'tax_group_id'])
  268 + ->viaTable('tax_group_to_category', ['category_id' => 'category_id']);
  269 + }
264 270 }
... ...
common/modules/product/models/Import.php
  Show/Hide comments   View file @d09f430
... ... @@ -312,7 +312,7 @@ class Import extends Model {
312 312  
313 313 foreach($catalog_names as $catalog_name){
314 314 // ==== Set category ====
315   - if ( ($category = CategoryName::find()->filterWhere(['ilike', 'value', trim($catalog_name)])->one()) === null ) {
  315 + if ( ($category = Category::find()->filterWhere(['ilike', 'name', trim($catalog_name)])->one()) === null ) {
316 316 // Create category
317 317 $category = new Category();
318 318 $category->name = trim($catalog_name);
... ... @@ -327,7 +327,7 @@ class Import extends Model {
327 327  
328 328 // ===== Set brand ====
329 329 if ( $brand_name ) {
330   - if ( ($brand = BrandName::find()->filterWhere(['ilike', 'value', trim($brand_name)])->one()) !== null ) {
  330 + if ( ($brand = Brand::find()->filterWhere(['ilike', 'name', trim($brand_name)])->one()) !== null ) {
331 331 $_product->brand_id = $brand->brand_id;
332 332 } else {
333 333 // Create brand
... ... @@ -527,7 +527,7 @@ class Import extends Model {
527 527 $taxGroup->name = $filter_name;
528 528 $taxGroup->module = 'string';
529 529 $taxGroup->hierarchical = FALSE;
530   - $taxGroup->group_to_category = $catalog_names;
  530 + $taxGroup->categories = $catalog_names;
531 531 $taxGroup->is_filter = FALSE;
532 532 $taxGroup->save();
533 533 }
... ...
common/modules/product/models/Product.php
  Show/Hide comments   View file @d09f430
... ... @@ -264,7 +264,10 @@ class Product extends \yii\db\ActiveRecord
264 264 foreach ($this->options as $option) {
265 265 $options[$option->tax_group_id][] = $option;
266 266 }
267   - foreach (TaxGroup::find()->joinWith('categories')->where(['tax_group.tax_group_id' => array_keys($options), 'tax_group.display' => TRUE, 'category.category_id' => $category_id])->all() as $group) {
  267 +
  268 + $taxGroups = TaxGroup::find()->joinWith('categories')->where(['tax_group.tax_group_id' => array_keys($options), 'tax_group.display' => TRUE, 'category.category_id' => $category_id])->all();
  269 +
  270 + foreach ($taxGroups as $group) {
268 271 if (!empty($options[$group->tax_group_id])) {
269 272 $group->_options = $options[$group->tax_group_id];
270 273 $groups[] = $group;
... ... @@ -296,19 +299,20 @@ class Product extends \yii\db\ActiveRecord
296 299 {
297 300 parent::afterSave($insert, $changedAttributes);
298 301  
299   -// $images = UploadedFile::getInstance($this, 'imagesUpload');
300   -// var_dump($images);exit;
301 302  
302   -// if (!empty($this->imagesUpload)) {
303   -// if (!is_array($this->imagesUpload)) {
304   -// $this->imagesUpload = [$this->imagesUpload];
305   -// }
306   -// foreach($this->imagesUpload as $image) {
307   -// $image->saveAs((Yii::getAlias('@frontend/web/storage/products/original/' . $image->baseName .'_'. uniqid() . '.' . $image->extension)));
308   -// }
309   -//
310   -//
311   -// }
  303 + $this->unlinkAll('categories', true);
  304 + $this->unlinkAll('options',true);
  305 +
  306 +
  307 + $categories = Category::findAll($this->categories);
  308 + $options = TaxOption::findAll($this->options);
  309 +
  310 + foreach($options as $option){
  311 + $this->link('options', $option);
  312 + }
  313 + foreach($categories as $category){
  314 + $this->link('categories', $category);
  315 + }
312 316  
313 317 if (!empty($this->_variants)) {
314 318 $todel = [];
... ... @@ -341,7 +345,6 @@ class Product extends \yii\db\ActiveRecord
341 345 ProductCategory::deleteAll(['product_id' => $this->product_id]);
342 346 ProductVariant::deleteAll(['product_id' => $this->product_id]);
343 347 ProductOption::deleteAll(['product_id' => $this->product_id]);
344   - //ProductVariantOption::deleteAll(['product_id' => $this->product_id]);
345 348 ProductStock::deleteAll(['product_id' => $this->product_id]);
346 349 Share::deleteAll(['product_id' => $this->product_id]);
347 350 return true;
... ... @@ -435,4 +438,15 @@ class Product extends \yii\db\ActiveRecord
435 438 $categories = ArrayHelper::getColumn($this->categories, 'category_id');
436 439 return TaxGroup::find()->distinct()->innerJoin('tax_group_to_category', 'tax_group_to_category.tax_group_id = tax_group.tax_group_id')->andWhere(['tax_group_to_category.category_id' => $categories])->andWhere(['level' => $level]);
437 440 }
  441 +
  442 + public function setCategories($values)
  443 + {
  444 + $this->categories = $values;
  445 + }
  446 +
  447 + public function setOptions($values)
  448 + {
  449 + $this->options = $values;
  450 + }
  451 +
438 452 }
... ...
common/modules/product/models/ProductSearch.php
  Show/Hide comments   View file @d09f430
... ... @@ -26,7 +26,7 @@ class ProductSearch extends Product
26 26 {
27 27 return [
28 28 [['name', 'brand_name', 'brand_id', 'category_id', 'category_name', 'variant_sku'], 'safe'],
29   - [['tax_brand_id', 'product_id'], 'integer'],
  29 + [['brand_id', 'product_id'], 'integer'],
30 30 [['is_top', 'is_new', 'akciya'], 'boolean'],
31 31 ];
32 32 }
... ... @@ -49,12 +49,12 @@ class ProductSearch extends Product
49 49 */
50 50 public function search($params)
51 51 {
  52 +
52 53 $query = Product::find();
53 54  
54 55 $query->joinWith(['brand', 'categories', 'variant']);
55 56  
56 57 $query->groupBy(['product.product_id']);
57   - $query->orderBy('product.product_id', 'DESC');
58 58  
59 59 $dataProvider = new ActiveDataProvider([
60 60 'query' => $query,
... ... @@ -68,8 +68,8 @@ class ProductSearch extends Product
68 68 'attributes' => [
69 69 'name',
70 70 'brand_name' => [
71   - 'asc' => ['brand_name.value' => SORT_ASC],
72   - 'desc' => ['brand_name.value' => SORT_DESC],
  71 + 'asc' => ['brand.name' => SORT_ASC],
  72 + 'desc' => ['brand.name' => SORT_DESC],
73 73 'default' => SORT_DESC,
74 74 'label' => 'Brand name',
75 75 ],
... ... @@ -100,8 +100,8 @@ class ProductSearch extends Product
100 100 ]);
101 101  
102 102 $query->andFilterWhere(['ilike', 'product.name', $this->name]);
103   - $query->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
104   - $query->andFilterWhere(['ilike', 'category_name.value', $this->category_name]);
  103 + $query->andFilterWhere(['ilike', 'brand.name', $this->brand_name]);
  104 + $query->andFilterWhere(['ilike', 'category.name', $this->category_name]);
105 105 $query->andFilterWhere(['ilike', 'product_variant.sku', $this->variant_sku]);
106 106  
107 107 return $dataProvider;
... ...
common/modules/rubrication/models/TaxGroup.php
  Show/Hide comments   View file @d09f430
... ... @@ -22,11 +22,11 @@ use Yii;
22 22 * @property TaxGroupToGroup[] $taxGroupToGroups
23 23 * @property TaxGroupToGroup[] $taxGroupToGroups0
24 24 * @property TaxOption[] $taxOptions
25   - * @property TaxOptionToGroup[] $taxOptionToGroups
26 25 */
27 26 class TaxGroup extends \yii\db\ActiveRecord
28 27 {
29 28 public $_options = [];
  29 +
30 30 /**
31 31 * @inheritdoc
32 32 */
... ... @@ -62,7 +62,7 @@ class TaxGroup extends \yii\db\ActiveRecord
62 62 [['level', 'sort'], 'integer'],
63 63 [['alias', 'module'], 'string', 'max' => 50],
64 64 [['name'], 'string', 'max' => 255],
65   - [['group_to_category'], 'safe']
  65 + [['categories'], 'safe']
66 66 ];
67 67 }
68 68  
... ... @@ -95,16 +95,25 @@ class TaxGroup extends \yii\db\ActiveRecord
95 95  
96 96 public function getCategories()
97 97 {
98   - return $this->hasMany(Category::className(), ['category_id' => 'entity2_id'])
99   - ->viaTable('relation', ['entity1_id' => 'tax_group_id']);
  98 + return $this->hasMany(Category::className(), ['category_id' => 'category_id'])
  99 + ->viaTable('tax_group_to_category', ['tax_group_id' => 'tax_group_id']);
100 100 }
101   -
102   - /**
103   - * @return \yii\db\ActiveQuery
104   - */
105   - public function getTaxGroupToGroups0()
  101 +
  102 + public function setCategories($values)
106 103 {
107   - return $this->hasMany(TaxGroupToGroup::className(), ['tax_group2_id' => 'tax_group_id'])->inverseOf('taxGroup2');
  104 + $this->categories = $values;
  105 + }
  106 +
  107 + public function afterSave($insert, $changedAttributes)
  108 + {
  109 +
  110 + $this->unlinkAll('categories',true);
  111 + $categories = Category::findAll($this->categories);
  112 + foreach($categories as $category){
  113 + $this->link('categories', $category);
  114 + }
  115 +
  116 +
108 117 }
109 118  
110 119 /**
... ...
common/modules/product/models/TaxGroupToCategory.php renamed to common/modules/rubrication/models/TaxGroupToCategory.php
  Show/Hide comments   View file @d09f430
1 1 <?php
2 2  
3   -namespace common\modules\product\models;
  3 +namespace common\modules\rubrication\models;
4 4  
5   -use common\modules\rubrication\models\TaxGroup;
  5 +use common\modules\product\models\Category;
6 6 use Yii;
7 7  
8 8 /**
... ...
common/modules/rubrication/views/tax-group/_form.php
  Show/Hide comments   View file @d09f430
... ... @@ -25,7 +25,7 @@ use common\components\artboxtree\ArtboxTreeHelper;
25 25 'prompt' => Yii::t('rubrication', 'Select module'),
26 26 ]) ?>
27 27  
28   - <?= $form->field($model, 'group_to_category')->dropDownList(
  28 + <?= $form->field($model, 'categories')->dropDownList(
29 29 ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
30 30 [
31 31 'multiple' => true
... ...
common/widgets/Mailer.php
  Show/Hide comments   View file @d09f430
... ... @@ -44,6 +44,7 @@ class Mailer extends Widget{
44 44 $address = "Rukzachok.com.ua@gmail.com";
45 45 $mail->AddAddress($address);
46 46 $mail->AddAddress($this->email);
  47 + $mail->AddAddress('dockdep@gmail.com');
47 48 if(!$mail->send()) {
48 49  
49 50 \Yii::$app->getSession()->setFlash('error', 'Mailer Error: ' . $mail->ErrorInfo);
... ...
frontend/assets/FotoramaAsset.php 0 โ†’ 100644
  Show/Hide comments   View file @d09f430
  1 +<?php
  2 +/**
  3 + * @link http://www.yiiframework.com/
  4 + * @copyright Copyright (c) 2008 Yii Software LLC
  5 + * @license http://www.yiiframework.com/license/
  6 + */
  7 +
  8 +namespace frontend\assets;
  9 +
  10 +use yii\web\AssetBundle;
  11 +
  12 +/**
  13 + * @author Qiang Xue <qiang.xue@gmail.com>
  14 + * @since 2.0
  15 + */
  16 +class FotoramaAsset extends AssetBundle
  17 +{
  18 + public $sourcePath = '@bower';
  19 + public $css = [
  20 + 'fotorama/fotorama.css'
  21 + ];
  22 + public $js = [
  23 + 'fotorama/fotorama.js'
  24 + ];
  25 + public $jsOptions = array(
  26 + 'position' => \yii\web\View::POS_END
  27 + );
  28 +}
... ...
frontend/controllers/BasketController.php
  Show/Hide comments   View file @d09f430
... ... @@ -17,7 +17,7 @@ class BasketController extends \yii\web\Controller
17 17 $basket = \Yii::$app->basket;
18 18 $result = [
19 19 'basket' => $basket->getData(),
20   - 'modal' => $basket->getModal(),
  20 + 'modal' => $this->getModal($basket),
21 21 ];
22 22 return $result;
23 23 }
... ... @@ -31,7 +31,7 @@ class BasketController extends \yii\web\Controller
31 31 $basket->add($product_variant_id, $count);
32 32 $result = [
33 33 'basket' => $basket->getData(),
34   - 'modal' => $basket->getModal(),
  34 + 'modal' => $this->getModal($basket),
35 35 ];
36 36 return $result;
37 37 }
... ... @@ -45,7 +45,7 @@ class BasketController extends \yii\web\Controller
45 45 $basket->set($product_variant_id, $count);
46 46 $result = [
47 47 'basket' => $basket->getData(),
48   - 'modal' => $basket->getModal(),
  48 + 'modal' => $this->getModal($basket),
49 49 ];
50 50 return $result;
51 51 }
... ... @@ -54,7 +54,25 @@ class BasketController extends \yii\web\Controller
54 54 * @var Basket $basket
55 55 */
56 56 $basket = \Yii::$app->basket;
57   - $modal = $basket->getModal();
  57 + $modal = $this->getModal($basket);
58 58 return $modal;
59 59 }
  60 +
  61 + /**
  62 + * @var $basket \common\models\Basket
  63 + * @return string modal_items
  64 + */
  65 + public function getModal($basket): string
  66 + {
  67 + $output = '';
  68 + $data = $basket->getData();
  69 + $models = $basket->findModels(array_keys($data));
  70 + if(!empty( $models )) {
  71 + $output = $this->renderAjax('modal_items', [
  72 + 'models' => $models,
  73 + 'basket' => $basket,
  74 + ]);
  75 + }
  76 + return $output;
  77 + }
60 78 }
... ...
frontend/controllers/OrderController.php 0 โ†’ 100644
  Show/Hide comments   View file @d09f430
  1 +<?php
  2 +
  3 +namespace frontend\controllers;
  4 +
  5 +
  6 +use common\models\Customer;
  7 +use common\models\OrdersProducts;
  8 +use common\widgets\Mailer;
  9 +use Yii;
  10 +use yii\helpers\ArrayHelper;
  11 +use yii\web\Controller;
  12 +use common\models\Basket;
  13 +use common\modules\product\models\ProductVariant;
  14 +use common\models\Orders;
  15 +
  16 +
  17 +class OrderController extends Controller
  18 +{
  19 +
  20 +
  21 + public function actionIndex()
  22 + {
  23 + $basket = \Yii::$app->basket;
  24 + $data = $basket->getData();
  25 + $models = $basket->findModels(array_keys($data));
  26 + return $this->render('index', [
  27 + 'models' => $models,
  28 + 'basket' => $basket,
  29 + ]);
  30 + }
  31 +
  32 +
  33 + /**
  34 + *
  35 + * @return string
  36 + */
  37 + public function actionSave()
  38 + {
  39 + $modelOrder = new Orders;
  40 + /**
  41 + * @var $basket Basket
  42 + */
  43 + $basket = \Yii::$app->basket;
  44 + $productV = $basket->getData();
  45 +
  46 + if(!empty($productV) && $modelOrder->load(Yii::$app->request->post())&& $modelOrder->save()){
  47 +
  48 + foreach ($productV as $index=>$row) {
  49 + $modelOrdersProducts = new OrdersProducts();
  50 + $mod_id = $index;
  51 +
  52 +
  53 + $product = ProductVariant::findOne($mod_id);
  54 + /**
  55 + * ะŸั€ะพะฒะตั€ัะตะผ ั‚ะพะฒะฐั€ ะฝะฐ ะฝะฐะปะธั‡ะธะต
  56 + */
  57 +
  58 + if(!$product->stock > 0 || !$product->price > 0 ){
  59 +
  60 + /**
  61 + * ะ”ะพะฑะฐะฒะปัะตะผ ัะพะพะฑั‰ะตะฝะธะต ะพะฑ ะพัˆะธะฑะบะต
  62 + */
  63 + \Yii::$app->getSession()->setFlash('error', 'ะš ัะพะถะฐะปะตะฝะธัŽ ั‚ะพะฒะฐั€ะฐ '.$product->name . ' ะฝะตั‚ ะฒ ะฝะฐะปะธั‡ะธะธ');
  64 + /**
  65 + * ะฃะดะฐะปัะตะผ ะทะฐะบะฐะท
  66 + */
  67 + $modelOrder->delete();
  68 +
  69 + }else {
  70 +
  71 + /**
  72 + * ะฃะดะฐะปัะตะผ ั‚ะพะฒะฐั€ ั ะผะฐััะธะฒะฐ ะธ ัะพั…ั€ะฐะฝัะตะผ ะฒ ะทะฐะบะฐะท
  73 + */
  74 +
  75 +
  76 +
  77 + $modelOrdersProducts->order_id = $modelOrder->id;
  78 + $modelOrdersProducts->product_name = $product->product->name;
  79 + $modelOrdersProducts->name = $product->name;
  80 + $modelOrdersProducts->price = $productV[$index]['price'];
  81 + $modelOrdersProducts->count= $productV[$index]['count'];
  82 + $modelOrdersProducts->sum_cost = $productV[$index]['price'] *$productV[$index]['count'] ;
  83 + $modelOrdersProducts->mod_id = $mod_id;
  84 + $modelOrdersProducts->sku = $product->sku;
  85 + $modelOrdersProducts->validate();
  86 + $modelOrdersProducts->save();
  87 + $productV[$index] = ArrayHelper::toArray($modelOrdersProducts);
  88 + $productV[$index]['img'] = \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list');
  89 + }
  90 +
  91 + }
  92 +
  93 + /**
  94 + * ะกะพั…ั€ะฐะฝัะตะผ ะทะฐะบะฐะท
  95 + */
  96 +
  97 +
  98 + if(!Yii::$app->user->id && !empty($modelOrder->email)){
  99 + $modelUser = new Customer();
  100 + $modelUser->role = 'person';
  101 + $modelUser->username = $modelOrder->email;
  102 + $modelUser->name = $modelOrder->name;
  103 + $modelUser->phone = $modelOrder->phone;
  104 + $modelUser->password = Yii::$app->getSecurity()->generateRandomString(10);
  105 + $modelUser->group_id = 2;
  106 + $modelUser->save();
  107 + }
  108 + $order = clone $modelOrder;
  109 + /**
  110 + * ะงะธัั‚ะธะผ ัะตััะธัŽ ะบะพั€ะทะธะฝั‹
  111 + */
  112 +
  113 + $modelOrder->clearBasket();
  114 +
  115 + Mailer::widget(
  116 + ['type' => 'order',
  117 + 'subject'=> 'ะกะฟะฐัะธะฑะพ ะทะฐ ะฟะพะบัƒะฟะบัƒ',
  118 + 'email' => $modelOrder->email,
  119 + 'params' => [
  120 + 'order' => $order,
  121 + 'variants' => $productV,
  122 + ]
  123 + ]);
  124 +
  125 + //$text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15";
  126 + //Yii::$app->sms->send($order->phone, $text);
  127 +
  128 + Yii::$app->session['order_data']= ['order' => $order,'variants'=>$productV];
  129 +
  130 + return $this->redirect(['order/success',
  131 + ]);
  132 + }
  133 +
  134 + $data = $basket->getData();
  135 + $models = $basket->findModels(array_keys($data));
  136 + return $this->render('index', [
  137 + 'models' => $models,
  138 + 'basket' => $basket
  139 + ]);
  140 + }
  141 +
  142 + public function actionSuccess(){
  143 + return $this->render('success', [
  144 +
  145 + ]);
  146 + }
  147 +
  148 +}
... ...
frontend/models/ProductFrontendSearch.php
  Show/Hide comments   View file @d09f430
... ... @@ -53,7 +53,7 @@ class ProductFrontendSearch extends Product {
53 53 $dataProvider = new ActiveDataProvider([
54 54 'query' => $this->getSearchQuery($category, $params),
55 55 'pagination' => [
56   - 'pageSize' => 16,
  56 + 'pageSize' => 15,
57 57 ],
58 58 'sort' => [
59 59 'attributes' => [
... ... @@ -91,7 +91,7 @@ class ProductFrontendSearch extends Product {
91 91 $query = Product::find();
92 92 }
93 93 $query->select(['product.*']);
94   - $query->joinWith(['enabledVariants','brand', 'category']);
  94 + $query->joinWith(['enabledVariants','brand','options', 'category']);
95 95  
96 96 $query->groupBy(['product.product_id', 'product_variant.price']);
97 97  
... ...
frontend/views/basket/modal_items.php
  Show/Hide comments   View file @d09f430
... ... @@ -2,7 +2,8 @@
2 2 use common\models\Basket;
3 3 use common\modules\product\models\ProductVariant;
4 4 use yii\helpers\Html;
5   - use yii\web\View;
  5 +use yii\helpers\Url;
  6 +use yii\web\View;
6 7  
7 8 /**
8 9 * @var View $this
... ... @@ -63,7 +64,8 @@
63 64 ?>
64 65 <tr>
65 66 <td class="left">
66   - <a href="ordering.htm" class="btn">ะžั„ะพั€ะผะธั‚ัŒ ะทะฐะบะฐะท</a>
  67 + <?= Html::a('ะžั„ะพั€ะผะธั‚ัŒ ะทะฐะบะฐะท',Url::to('/order'),['class'=>'btn'])?>
  68 +
67 69 </td>
68 70 <td class="right">
69 71 <div class="back_to_shop">
... ...
frontend/views/catalog/_product_item.php
  Show/Hide comments   View file @d09f430
... ... @@ -24,7 +24,7 @@ use yii\helpers\Url;
24 24 ]) ?>
25 25 </a>
26 26 <div class="info_icons">
27   - <a href="#" class="btn buy_button" data-toggle="modal" data-target="#buyForm" data-id="<?=$model->variant->product_variant_id; ?>" lang="145">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ </a>
  27 + <a href="#" class="btn buy_button" data-toggle="modal" data-target="#buyForm" data-id="<?=$model->variant->product_variant_id; ?>" lang="145">ะšัƒะฟะธั‚ัŒ</a>
28 28 <ul class="ul wishlike_block hidden">
29 29 <li class="compare hidden">
30 30 <a onclick="add2compare(); return false;" class="compare compare_text_link_3631483" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
... ... @@ -40,29 +40,24 @@ use yii\helpers\Url;
40 40 <div class="dlexfduinxipi">
41 41 ะฆะตะฝะฐ:
42 42 <span class="main">
43   - 932.40
  43 + <?= $model->variant->price ?>
44 44 <span class="currency">ะณั€ะฝ</span>
45 45 </span>
46 46 </div>
47 47 </div>
48 48 <div class="additional_info params">
49   - <div class="additional_title" style="display: none;"><a href="http://www.linija-svitla.ua/podvesnoy-svetilnik-massive-41782-53-10-145.htm">ะ›ัŽัั‚ั€ั‹ Massive 41782/53/10</a></div>
50   - <div class="block_product_status av" title="70 1">
51   - ะตัั‚ัŒ ะฝะฐ ัะบะปะฐะดะต
52   - </div>
53 49 <div class="block_title">ะžัะพะฑะตะฝะฝะพัั‚ะธ</div>
54 50 <div class="descr">
55 51 <div class="info">
56 52 <ul class="sv">
57   - <li><span>ะขะธะฟ:</span> ะฟะพะดะฒะตัะฝะพะน ัะฒะตั‚ะธะปัŒะฝะธะบ</li>
58   - <li><span>ะ‘ั€ะตะฝะด:</span> Massive</li>
59   - <li><span>ะœะพะดะตะปัŒ: </span>41782/53/10</li>
60   - <li><span>ะบะพะป-ะฒะพ ะปะฐะผะฟ: </span>1</li>
61   - <li><span>ั†ะพะบะพะปัŒ: </span>E27</li>
62   - <li><span>ะผะพั‰ะฝะพัั‚ัŒ: </span>max. 60W</li>
63   - <li><span>ะฒั‹ัะพั‚ะฐ: </span>1250</li>
64   - <li><span>ัˆะธั€ะธะฝะฐ: </span>275</li>
65   - <li><span>ะฒั‹ัั‚ัƒะฟะฐัŽั‰ะฐั ั‡ะฐัั‚ัŒ: </span>275</li>
  53 +
  54 + <li><span>ะ‘ั€ะตะฝะด:</span> <?= $model->brand->name ?></li>
  55 +
  56 + <?php foreach($model->getActiveProperties($category->category_id) as $group): ?>
  57 + <li><span><?= $group->name ?> <?php foreach($group->_options as $option) : ?>&nbsp;</span><?= $option->ValueRenderHTML ?><?php endforeach ?></li>
  58 + <?php endforeach; ?>
  59 +
  60 +
66 61 </ul>
67 62 </div>
68 63 <div class="clearfix"></div>
... ... @@ -71,7 +66,7 @@ use yii\helpers\Url;
71 66 <div class="dlexfduinxipi">
72 67 ะฆะตะฝะฐ:
73 68 <span class="main">
74   - 932.40
  69 + <?= $model->variant->price ?>
75 70 <span class="currency">ะณั€ะฝ</span>
76 71 </span>
77 72 </div>
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @d09f430
1   -
  1 +<?php
  2 +
  3 +use common\components\artboximage\ArtboxImageHelper;
  4 +use frontend\assets\FotoramaAsset;
  5 +use frontend\widgets\Seo;
  6 +FotoramaAsset::register($this);
  7 +$this->params[ 'seo' ][ 'key' ] = $category->name;
  8 +$this->params[ 'seo' ][ 'fields' ][ 'name' ] = $product->fullname;
  9 +$this->params[ 'seo' ][ 'h1' ] = !empty( Seo::widget([ 'row' => 'h1' ]) ) ? Seo::widget([ 'row' => 'h1' ]) : $product->fullname;
  10 +$this->title = $product->fullname;
  11 +
  12 +$this->params[ 'breadcrumbs' ][] = [
  13 + 'label' => $category->name,
  14 + 'url' => [
  15 + 'catalog/category',
  16 + 'category' => $category,
  17 + ],
  18 +];
  19 +$this->params[ 'breadcrumbs' ][] = $product->fullname . ' #' . $product->enabledVariants[ 0 ]->sku;
  20 +?>
2 21 <!-- ะขะฐะฑั‹ ะดะปั ัะปะฐะนะดะตั€ะฐ -->
3 22 <div class="bigSlidertabs fixed" style="position:fixed;">
4 23 <div class="block-100">
... ... @@ -17,173 +36,12 @@
17 36 </div>
18 37 </div>
19 38  
20   -
21   - <div id="catSlider">
22   -
23   - <div id="myCarousel" class="carousel slide">
24   -
25   - <!-- ะšะฐั€ั‚ะธะฝะบะธ ะฒ ะบะฐั€ัƒัะตะปัŒะบะต -->
26   - <div class="carousel-inner">
27   -
28   -
29   -
30   -
31   - <div class="active item">
32   -
33   - <div class="container">
34   -
35   -
36   -
37   - </div>
38   -
39   - </div>
40   -
41   -
42   -
43   -
44   - <div class=" item">
45   -
46   - <div class="container">
47   -
48   -
49   -
50   - </div>
51   -
52   - </div>
53   -
54   -
55   -
56   -
57   - <div class=" item">
58   -
59   - <div class="container">
60   -
61   -
62   -
63   - </div>
64   -
65   - </div>
66   -
67   -
68   -
69   -
70   - <div class=" item">
71   -
72   - <div class="container">
73   -
74   -
75   -
76   - </div>
77   -
78   - </div>
79   -
80   -
81   -
82   -
83   - <div class=" item">
84   -
85   - <div class="container">
86   -
87   -
88   -
89   - </div>
90   -
91   - </div>
92   -
93   -
94   -
95   -
96   - <div class=" item">
97   -
98   - <div class="container">
99   -
100   -
101   -
102   - </div>
103   -
104   - </div>
105   -
106   -
107   -
108   -
109   - </div>
110   -
111   - <!-- ะะฐะฒะธะณะฐั†ะธะพะฝะฝั‹ะต ัะปะตะผะตะฝั‚ั‹ -->
112   - <a class="carousel-control left" href="#myCarousel" data-slide="prev">
113   - <span class="carousel-control-nav left"></span>
114   - <!--<img class="img-nav img-prev" />-->
115   - </a>
116   - <a class="carousel-control right" href="#myCarousel" data-slide="next">
117   - <span class="carousel-control-nav right"></span>
118   - <!--<img class="img-nav img-next" />-->
119   - </a>
120   -
121   -
122   - </div>
123   -
124   -
125   -
126   - </div>
127   -
128   -
129   -
130   -
131   -
132   -
133   -
134   - <!--<script src="http://www.linija-svitla.ua/res/js/jshttprequest.js"></script>-->
135   -
136   - <div class="wrapper white item_container" data-json='%7B%22id%22%3A%225892%22%2C%22model%22%3A%22FE%5C%2FLEILA6%22%2C%22price%22%3A35845.2%2C%22release_date%22%3A%222013-11-23%22%2C%22available%22%3A%22-1%22%2C%22mark%22%3Anull%2C%22prod_type%22%3A%22%5Cu043b%5Cu044e%5Cu0441%5Cu0442%5Cu0440%5Cu0430%22%2C%22brand%22%3A%7B%22id%22%3A%227%22%2C%22name%22%3A%22Elstead%22%2C%22seo_alias%22%3A%22elstead%22%2C%22seo%22%3A%22elstead-7.htm%22%2C%22url%22%3A%22http%3A%5C%2F%5C%2Fwww.linija-svitla.ua%5C%2Felstead-7.htm%22%7D%2C%22seo%22%3A%22lyustra-elstead-fe-leila6-5892.htm%22%2C%22url%22%3A%22http%3A%5C%2F%5C%2Fwww.linija-svitla.ua%5C%2Flyustra-elstead-fe-leila6-5892.htm%22%2C%22in_cart%22%3A0%2C%22listType%22%3A%22Details%22%2C%22categoryPath%22%3A%22%5Cu043b%5Cu044e%5Cu0441%5Cu0442%5Cu0440%5Cu044b%22%7D'>
137   -
138   - <div class="container">
139   -
140   - <div class="breadcrumbs" xmlns:v="http://rdf.data-vocabulary.org/">
141   - <div class="container">
142   - <div class="margin-left-right-10">
143   - <ul class="ul">
144   - <li class="bread_item has_childs has_link" style="z-index: 10;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
145   - <a href="http://www.linija-svitla.ua/" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะ˜ะฝั‚ะตั€ะฝะตั‚-ะผะฐะณะฐะทะธะฝ ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ</span></a>
146   - </li>
147   -
148   - <li class="arr bread_item">></li>
149   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
150   - <a href="http://www.linija-svitla.ua/lyustry-2.htm" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะปัŽัั‚ั€ั‹</span></a>
151   - </li>
152   - <li class="arr bread_item">></li>
153   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
154   - <a href="http://www.linija-svitla.ua/podvesnye-3439.htm" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะŸะพะดะฒะตัะฝั‹ะต</span></a>
155   - </li>
156   - <li class="arr bread_item">></li>
157   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
158   - <a href="http://www.linija-svitla.ua/podvesnye-3439.htm?fbrandlist=7" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">Elstead</span></a>
159   - </li>
160   - <li class="arr bread_item">></li>
161   - <li class="bread_item" style="z-index: 6;">
162   - <span class="last">Elstead FE/LEILA6</span>
163   - </li>
164   - </ul>
165   - <div class="clearfix"></div>
166   - </div>
167   - </div>
168   - </div>
169   -
170   - <style>
171   - .breadcrumbs span.text{
172   - text-transform:capitalize;
173   - }
174   - </style>
175   -
176   -
177   -
178   - </div>
179   -
  39 + <div class="wrapper white item_container">
180 40 <div class="container">
181 41 <div class="product_detail">
182 42  
183   - <h1 itemprop="name"> ะปัŽัั‚ั€ะฐ
184   - Elstead
185   - </h1>
186   - <div class="product_code">ะšะพะด: FE/LEILA6</div>
  43 + <h1 itemprop="name"><?= Seo::widget([ 'row' => 'h1' ]) ?></h1>
  44 + <div class="product_code">ะšะพะด:<?= $product->variant->sku?></div>
187 45 <div class="clearfix"></div>
188 46 <!-- Image part -->
189 47  
... ... @@ -191,52 +49,27 @@
191 49  
192 50 <div class="position" >
193 51 <div class="img_part_big">
194   - <ul class="ul img_gallery">
195   - <li class="selected ">
196   - <a href="gallery/prod/fe_leila6/5892_3.jpg" target="_blank" title=" FE/LEILA6 " class="preview">
197   - <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila6/5892_10.jpg" itemprop="image">
198   - </a>
199   - </li>
200   - <li class="selected zoom hidden" id='ex3'>
201   -
202   -
203   -
204   - <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila6/5892_3.jpg" itemprop="image">
205   -
206   - <span class="lupa zoom_active"></span>
207   -
208   - <div class="zoom_container">
209   - <div class="zoom_wrapper">
210   - <div class="zoom_image">
211   - <table>
212   - <tbody>
213   - <tr>
214   - <td>
215   - <img data-original="http://www.linija-svitla.ua/gallery/prod/fe_leila6/5892_3.jpg" src="http://www.linija-svitla.ua/gallery/prod/fe_leila6/5892_3.jpg" alt="ะปัŽัั‚ั€ะฐ - Elstead FE/LEILA6" title="ะปัŽัั‚ั€ะฐ - Elstead FE/LEILA6" width="900">
216   - </td>
217   - </tr>
218   - </tbody>
219   - </table>
220   - </div>
221   - </div>
222   - </div>
223   - <div class="zoom_lupa"></div>
  52 + <?php if (!empty($product->images)) :?>
  53 + <div class="fotorama" data-allowfullscreen="true" data-nav="thumbs">
  54 +
  55 + <?php foreach($product->images as $image) :?>
  56 + <a href="<?=$image->imageUrl ?>">
  57 + <?= ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb')?>
  58 + </a>
  59 + <?php endforeach?>
  60 + </div>
  61 + <?php else :?>
  62 + <div class="fotorama" data-allowfullscreen="true" data-nav="click">
224 63  
  64 + <a href="<?=$product->imageUrl ?>">
  65 + <?= ArtboxImageHelper::getImage($product->imageUrl, 'product_trumb')?>
  66 + </a>
225 67  
226   - </li>
227   - </ul>
  68 + </div>
  69 + <?php endif?>
228 70 </div>
229 71  
230   - <!--<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script>-->
231 72  
232   - <script>
233   - $(document).ready(function(){
234   - $('#ex1').zoom();
235   - $('#ex2').zoom({ on:'grab' });
236   - $('#ex3').zoom({ on:'click' });
237   - $('#ex4').zoom({ on:'toggle' });
238   - });
239   - </script>
240 73  
241 74  
242 75  
... ... @@ -278,26 +111,19 @@
278 111  
279 112  
280 113 <span itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="price">
281   - <span itemprop="price" class="price">
282   - 35845.2 </span>
283   - <span style="display:none;" itemprop="priceCurrency">UAH</span>
284   - <span class="currency">&nbsp;ะณั€ะฝ.</span>
285   - </span>
  114 + <span itemprop="price" class="price">
  115 + <?php echo $product->variant->price;?>
  116 + </span>
  117 + <span style="display:none;" itemprop="priceCurrency">UAH</span>
  118 + <span class="currency">&nbsp;ะณั€ะฝ.</span>
  119 + </span>
286 120  
287 121 </td>
288 122 <td>
289 123  
290 124 <!-- ะšัƒะฟะธั‚ัŒ -->
291 125  
292   -
293   -
294   - <!--href="#/*http://www.linija-svitla.ua/ordering.htm*/"-->
295   - <a lang="5892" class="btn btnBuy buy_button btn-large1" data-id="<?php echo $product->variant->product_variant_id;?>" data-toggle="modal" data-target="#buyForm">
296   -
297   - ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ
298   -
299   -
300   - </a>
  126 + <a lang="5892" class="btn btnBuy buy_button btn-large1" data-id="<?php echo $product->variant->product_variant_id;?>" data-toggle="modal" data-target="#buyForm">ะšัƒะฟะธั‚ัŒ</a>
301 127  
302 128  
303 129  
... ... @@ -401,11 +227,10 @@
401 227  
402 228  
403 229 <div class="price">
404   - <span class="main">
405   - <span itemprop="price" class="price">
406   - 35845.2 </span>
  230 + <span class="main">
  231 + <span itemprop="price" class="price"><?= $product->variant->price ?></span>
407 232 <span class="currency">&nbsp;ะณั€ะฝ.</span>
408   - </span>
  233 + </span>
409 234 </div>
410 235  
411 236 <div class="follow_price">
... ... @@ -413,7 +238,7 @@
413 238 </div>
414 239  
415 240 <div class="buy_button">
416   - <a href="#" class="btn btn-large buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="5892">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ </a>
  241 + <a href="#" class="btn btn-large buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="5892">ะšัƒะฟะธั‚ัŒ</a>
417 242 <div class="payment_visa">
418 243 ะžะฟะปะฐั‚ะธั‚ัŒ
419 244 <a href="payment.htm#privat" target="_blank">
... ... @@ -507,929 +332,169 @@
507 332 <div class="tab-content">
508 333 <div role="tabpanel" class="tab-pane active" id="tab1">
509 334  
510   - <!--
511 335 <table>
512 336 <tbody>
  337 + <tr class="full short gray">
  338 + <td class="name">ID</td>
  339 + <td class="value"><?= $product->variant->sku ?> </td>
  340 + </tr>
  341 + <tr class="full short">
  342 + <td class="name">ะ‘ั€ะตะฝะด</td>
  343 + <td class="value"><?= $product->brand->name ?></td>
  344 + </tr>
  345 + <?php foreach($product->getActiveProperties($category->category_id) as $group): ?>
  346 + <tr class="full short gray">
  347 + <td class="name"><?= $group->name ?></td>
  348 + <td class="value"><?php foreach($group->_options as $option) : ?>&nbsp;<?= $option->ValueRenderHTML ?><?php endforeach ?></td>
  349 + </tr>
  350 + <?php endforeach; ?>
513 351  
  352 + </tbody>
  353 + </table>
  354 + </div>
  355 + <div role="tabpanel" class="tab-pane" id="tab2">
514 356  
  357 + <div class="block-100">
  358 + <?= $product->description ?>
  359 + </div>
515 360  
  361 + </div>
  362 + </div>
516 363  
517   - <tr class="full gray">
  364 + <div class="clearfix"></div>
  365 + <div class="collection">
  366 + <br />
  367 + <h2 id="collection">
  368 + ะšะพะปะปะตะบั†ะธั ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ <!--ะ”ะ•ะšะžะ ะ-->
  369 + </h2>
  370 + <div class="catalog_product_list view_table">
518 371  
519 372  
520 373  
521 374  
522 375  
523   - </tr>
  376 + <div class="catalog_item">
  377 + <div class="wrapper">
  378 + <div class="item_container">
  379 + <div class="title">
  380 + <a href="http://www.linija-svitla.ua/lyustra-elstead-fe-leila3-5893.htm">ะปัŽัั‚ั€ะฐ FE/LEILA3</a>
  381 + </div>
  382 + <div class="img">
  383 + <a href="http://www.linija-svitla.ua/lyustra-elstead-fe-leila3-5893.htm">
  384 + <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila3/5893_5.jpg" alt="ะปัŽัั‚ั€ะฐ FE/LEILA3" class="selected">
  385 + </a>
  386 + <div class="info_icons">
  387 + <a href="#" class="btn btnBuy buy_button" data-id="<?php echo $product->variant->product_variant_id; ?>" data-toggle="modal" data-target="#buyForm" lang="5893">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
  388 + <ul class="ul wishlike_block">
  389 + <li class="compare">
  390 + <a onclick="add2compare(); return false;" class="compare compare_text_link_5893" lang="5893" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
  391 + <span class="icon"></span>
  392 + </li>
  393 + <li class="like">
  394 + <a class="like like_text_link_5893" lang="5893" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
  395 + </li>
  396 + </ul>
  397 + </div>
  398 + </div>
  399 + <div class="price">
  400 + <div class="dlexfduinxipi">
  401 + ะฆะตะฝะฐ:
  402 + <span class="main"> 25794.00 <span class="currency">ะณั€ะฝ</span>
  403 + </span>
  404 + </div>
  405 + </div>
  406 + <div class="additional_info params">
  407 + </div>
524 408  
525 409  
  410 + <div class="opacity_bg"></div>
  411 + </div>
  412 + </div>
  413 + </div>
526 414  
527 415  
528   - <tr class="full gray">
529 416  
530 417  
531   - <td class="name">
532   - <img src="res/images/attr_icons/lc.png" alt="lc" style="" alt="ะบะพะป-ะฒะพ ะปะฐะผะฟ"/>
533   - </td>
534   - <td class="value">
535   - 6
536   - x
537   - </td>
  418 + <div class="catalog_item">
  419 + <div class="wrapper">
  420 + <div class="item_container">
  421 + <div class="title">
  422 + <a href="http://www.linija-svitla.ua/elstead-fe-leila1c-6991.htm"> FE/LEILA1C</a>
  423 + </div>
  424 + <div class="img">
  425 + <a href="http://www.linija-svitla.ua/elstead-fe-leila1c-6991.htm">
  426 + <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila1c/6991_5.jpg" alt=" FE/LEILA1C" class="selected">
  427 + </a>
  428 + <div class="info_icons">
  429 + <a href="#" class="btn btnBuy buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="6991">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
  430 + <ul class="ul wishlike_block">
  431 + <li class="compare">
  432 + <a onclick="add2compare(); return false;" class="compare compare_text_link_6991" lang="6991" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
  433 + <span class="icon"></span>
  434 + </li>
  435 + <li class="like">
  436 + <a class="like like_text_link_6991" lang="6991" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
  437 + </li>
  438 + </ul>
  439 + </div>
  440 + </div>
  441 + <div class="price">
  442 + <div class="dlexfduinxipi">
  443 + ะฆะตะฝะฐ:
  444 + <span class="main"> 14330.40 <span class="currency">ะณั€ะฝ</span>
  445 + </span>
  446 + </div>
  447 + </div>
  448 + <div class="additional_info params">
  449 + </div>
538 450  
539 451  
  452 + <div class="opacity_bg"></div>
  453 + </div>
  454 + </div>
  455 + </div>
540 456  
541   - </tr>
542 457  
543 458  
544 459  
  460 + <div class="catalog_item">
  461 + <div class="wrapper">
  462 + <div class="item_container">
  463 + <div class="title">
  464 + <a href="http://www.linija-svitla.ua/nastennyy-svetilnik-elstead-fe-leila2-5894.htm">ะฝะฐัั‚ะตะฝะฝั‹ะน ัะฒะตั‚ะธะปัŒะฝะธะบ FE/LEILA2</a>
  465 + </div>
  466 + <div class="img">
  467 + <a href="http://www.linija-svitla.ua/nastennyy-svetilnik-elstead-fe-leila2-5894.htm">
  468 + <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila2/5894_5.jpg" alt="ะฝะฐัั‚ะตะฝะฝั‹ะน ัะฒะตั‚ะธะปัŒะฝะธะบ FE/LEILA2" class="selected">
  469 + </a>
  470 + <div class="info_icons">
  471 + <a href="#" class="btn btnBuy buy_button" data-id="<?php echo $product->variant->product_variant_id; ?>" data-toggle="modal" data-target="#buyForm" lang="5894">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
  472 + <ul class="ul wishlike_block">
  473 + <li class="compare">
  474 + <a onclick="add2compare(); return false;" class="compare compare_text_link_5894" lang="5894" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
  475 + <span class="icon"></span>
  476 + </li>
  477 + <li class="like">
  478 + <a class="like like_text_link_5894" lang="5894" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
  479 + </li>
  480 + </ul>
  481 + </div>
  482 + </div>
  483 + <div class="price">
  484 + <div class="dlexfduinxipi">
  485 + ะฆะตะฝะฐ:
  486 + <span class="main"> 8598.00 <span class="currency">ะณั€ะฝ</span>
  487 + </span>
  488 + </div>
  489 + </div>
  490 + <div class="additional_info params">
  491 + </div>
545 492  
546   - <tr class="full short">
547 493  
548   -
549   - <td class="name">
550   - <img src="res/images/attr_icons/lt.png" alt="lt" style="" alt="ั†ะพะบะพะปัŒ"/>
551   - </td>
552   - <td class="value">
553   - E14
554   - </td>
555   -
556   -
557   -
558   - </tr>
559   -
560   -
561   -
562   -
563   - <tr class="full gray">
564   -
565   -
566   - <td class="name">
567   - <img src="res/images/attr_icons/power.png" alt="power" style="" alt="ะผะพั‰ะฝะพัั‚ัŒ"/>
568   - </td>
569   - <td class="value">
570   - 60W
571   - </td>
572   -
573   -
574   -
575   - </tr>
576   -
577   -
578   -
579   -
580   - <tr class="full short">
581   -
582   -
583   -
584   - </tr>
585   -
586   -
587   -
588   -
589   - <tr class="full short">
590   -
591   -
592   - <td class="name">
593   - <img src="res/images/attr_icons/voltage.png" alt="voltage" style="" alt="ะฝะฐะฟั€ัะถะตะฝะธะต"/>
594   - </td>
595   - <td class="value">
596   - 220 ะ’
597   - </td>
598   -
599   -
600   -
601   - </tr>
602   -
603   -
604   -
605   -
606   - <tr class="full gray">
607   -
608   -
609   -
610   - </tr>
611   -
612   -
613   -
614   -
615   - <tr class="full gray">
616   -
617   -
618   -
619   - </tr>
620   -
621   -
622   -
623   -
624   - <tr class="full gray">
625   -
626   -
627   -
628   - </tr>
629   -
630   -
631   -
632   -
633   - <tr class="full gray">
634   -
635   -
636   -
637   - </tr>
638   -
639   -
640   -
641   -
642   - <tr class="full gray">
643   -
644   -
645   -
646   - </tr>
647   -
648   -
649   -
650   -
651   - <tr class="full gray">
652   -
653   -
654   -
655   -
656   -
657   - </tr>
658   -
659   -
660   -
661   -
662   - <tr class="full gray">
663   -
664   -
665   - <td class="name">
666   - <img src="res/images/attr_icons/height.png" alt="height" style="" alt="ะฒั‹ัะพั‚ะฐ"/>
667   - </td>
668   - <td class="value">
669   - 686 ะผะผ
670   - </td>
671   -
672   -
673   -
674   - </tr>
675   -
676   -
677   -
678   -
679   - <tr class="full short">
680   -
681   -
682   -
683   - </tr>
684   -
685   -
686   -
687   -
688   - <tr class="full short">
689   -
690   -
691   -
692   - </tr>
693   -
694   -
695   -
696   -
697   - <tr class="full short">
698   -
699   -
700   - <td class="name">
701   - <img src="res/images/attr_icons/width.png" alt="width" style="" alt="ัˆะธั€ะธะฝะฐ"/>
702   - </td>
703   - <td class="value">
704   - 705 ะผะผ
705   - </td>
706   -
707   -
708   -
709   - </tr>
710   -
711   -
712   -
713   -
714   - <tr class="full gray">
715   -
716   -
717   -
718   - </tr>
719   -
720   -
721   -
722   -
723   - <tr class="full gray">
724   -
725   -
726   -
727   - </tr>
728   -
729   -
730   -
731   -
732   - <tr class="full gray">
733   -
734   -
735   -
736   - </tr>
737   -
738   -
739   -
740   -
741   - <tr class="full gray">
742   -
743   -
744   -
745   - </tr>
746   -
747   -
748   -
749   -
750   - <tr class="full gray">
751   -
752   -
753   -
754   - </tr>
755   -
756   -
757   -
758   -
759   - <tr class="full gray">
760   -
761   -
762   -
763   - </tr>
764   -
765   -
766   -
767   -
768   - <tr class="full gray">
769   -
770   -
771   -
772   - </tr>
773   -
774   -
775   -
776   -
777   - <tr class="full gray">
778   -
779   -
780   -
781   - </tr>
782   -
783   -
784   -
785   -
786   - <tr class="full gray">
787   -
788   -
789   -
790   -
791   -
792   - </tr>
793   -
794   -
795   -
796   -
797   - <tr class="full gray">
798   -
799   -
800   -
801   - </tr>
802   -
803   -
804   -
805   -
806   - <tr class="full gray">
807   -
808   -
809   - <td class="name">
810   - <img src="res/images/attr_icons/cvet.png" alt="cvet" style="" alt="ั†ะฒะตั‚"/>
811   - </td>
812   - <td class="value">
813   - Burnished Silver
814   - </td>
815   -
816   -
817   -
818   - </tr>
819   -
820   -
821   -
822   -
823   - <tr class="full short">
824   -
825   -
826   -
827   - </tr>
828   -
829   -
830   -
831   -
832   - <tr class="full short">
833   -
834   -
835   -
836   - </tr>
837   -
838   -
839   -
840   -
841   - <tr class="full short">
842   -
843   -
844   -
845   - </tr>
846   -
847   -
848   -
849   -
850   - <tr class="full short">
851   -
852   -
853   - <td class="name">
854   - <img src="res/images/attr_icons/kollekciya.png" alt="kollekciya" style="" alt="ะบะพะปะปะตะบั†ะธั"/>
855   - </td>
856   - <td class="value">
857   - Feiss
858   - </td>
859   -
860   -
861   -
862   - </tr>
863   -
864   -
865   -
866   -
867   - <tr class="full gray">
868   -
869   -
870   -
871   - </tr>
872   -
873   -
874   -
875   -
876   - <tr class="full gray">
877   -
878   -
879   -
880   -
881   -
882   - </tr>
883   -
884   -
885   -
886   -
887   - <tr class="full gray">
888   -
889   -
890   -
891   - </tr>
892   -
893   -
894   -
895   -
896   - <tr class="full gray">
897   -
898   -
899   -
900   -
901   -
902   - </tr>
903   -
904   -
905   -
906   -
907   - <tr class="full gray">
908   -
909   -
910   -
911   - </tr>
912   -
913   -
914   -
915   -
916   - <tr class="full gray">
917   -
918   -
919   -
920   - </tr>
921   -
922   -
923   -
924   -
925   - <tr class="full gray">
926   -
927   -
928   -
929   - </tr>
930   -
931   -
932   -
933   -
934   - <tr class="full gray">
935   -
936   -
937   -
938   - </tr>
939   -
940   -
941   -
942   -
943   - <tr class="full gray">
944   -
945   -
946   -
947   - </tr>
948   -
949   -
950   -
951   -
952   - <tr class="full gray">
953   -
954   -
955   -
956   -
957   -
958   - </tr>
959   -
960   -
961   -
962   -
963   - <tr class="full gray">
964   -
965   -
966   -
967   - </tr>
968   -
969   -
970   -
971   -
972   - <tr class="full gray">
973   -
974   -
975   -
976   -
977   -
978   - </tr>
979   -
980   -
981   -
982   -
983   - <tr class="full gray">
984   -
985   -
986   -
987   - </tr>
988   -
989   -
990   -
991   -
992   - <tr class="full gray">
993   -
994   -
995   -
996   -
997   -
998   - </tr>
999   -
1000   -
1001   -
1002   -
1003   - <tr class="full gray">
1004   -
1005   -
1006   -
1007   - </tr>
1008   -
1009   -
1010   -
1011   -
1012   - <tr class="full gray">
1013   -
1014   -
1015   -
1016   - </tr>
1017   -
1018   -
1019   -
1020   -
1021   - <tr class="full gray">
1022   -
1023   -
1024   -
1025   - </tr>
1026   -
1027   -
1028   -
1029   -
1030   - <tr class="full gray">
1031   -
1032   -
1033   -
1034   -
1035   -
1036   - </tr>
1037   -
1038   -
1039   -
1040   -
1041   - <tr class="full gray">
1042   -
1043   -
1044   -
1045   - </tr>
1046   -
1047   -
1048   -
1049   -
1050   - <tr class="full gray">
1051   -
1052   -
1053   -
1054   - </tr>
1055   -
1056   -
1057   -
1058   -
1059   - <tr class="full gray">
1060   -
1061   -
1062   -
1063   - </tr>
1064   -
1065   -
1066   -
1067   -
1068   - <tr class="full gray">
1069   -
1070   -
1071   -
1072   - </tr>
1073   -
1074   -
1075   -
1076   -
1077   - <tr class="full gray">
1078   -
1079   -
1080   -
1081   - </tr>
1082   -
1083   -
1084   -
1085   -
1086   - <tr class="full gray">
1087   -
1088   -
1089   -
1090   -
1091   -
1092   - </tr>
1093   -
1094   -
1095   -
1096   -
1097   - <tr class="full gray">
1098   -
1099   -
1100   -
1101   - </tr>
1102   -
1103   -
1104   -
1105   -
1106   - <tr class="full gray">
1107   -
1108   -
1109   -
1110   - </tr>
1111   -
1112   -
1113   -
1114   -
1115   - <tr class="full gray">
1116   -
1117   -
1118   -
1119   - </tr>
1120   -
1121   -
1122   -
1123   -
1124   - <tr class="full gray">
1125   -
1126   -
1127   -
1128   - </tr>
1129   -
1130   -
1131   -
1132   -
1133   - <tr class="full gray">
1134   -
1135   -
1136   -
1137   -
1138   -
1139   - </tr>
1140   -
1141   -
1142   -
1143   -
1144   - <tr class="full gray">
1145   -
1146   -
1147   -
1148   - </tr>
1149   -
1150   -
1151   -
1152   -
1153   - <tr class="full gray">
1154   -
1155   -
1156   -
1157   - </tr>
1158   -
1159   -
1160   -
1161   -
1162   - <tr class="full gray">
1163   -
1164   -
1165   -
1166   - </tr>
1167   -
1168   -
1169   -
1170   -
1171   - <tr class="full gray">
1172   -
1173   -
1174   -
1175   - </tr>
1176   -
1177   -
1178   -
1179   -
1180   - <tr class="full gray">
1181   -
1182   -
1183   -
1184   - </tr>
1185   -
1186   -
1187   -
1188   -
1189   - </tbody>
1190   - </table>
1191   - -->
1192   - <!--
1193   - <div class="table_title full short">
1194   - <span>ะžะฑั‰ะธะต ั…ะฐั€ะฐะบั‚ะตั€ะธัั‚ะธะบะธ</span>
1195   - <i></i>
1196   - </div>
1197   - -->
1198   - <table>
1199   - <tbody>
1200   - <tr class="full short gray">
1201   - <td class="name">ID</td>
1202   - <td class="value">5892</td>
1203   - </tr>
1204   - <tr class="full short">
1205   - <td class="name">ะ‘ั€ะตะฝะด</td>
1206   - <td class="value">
1207   - <a href="http://www.linija-svitla.ua/elstead-7.htm">Elstead</a>
1208   - </td>
1209   - </tr>
1210   - <tr class="full short gray">
1211   - <td class="name">ะั€ั‚ะธะบัƒะป</td>
1212   - <td class="value">FE/LEILA6</td>
1213   - </tr>
1214   - <tr class="full gray">
1215   - <td class="name">ะบะพะป-ะฒะพ ะปะฐะผะฟ</td><td class="value">6</td>
1216   - </tr>
1217   -
1218   - <tr class="full short">
1219   - <td class="name">ั†ะพะบะพะปัŒ</td><td class="value">E14</td>
1220   - </tr>
1221   -
1222   - <tr class="full gray">
1223   - <td class="name">ะผะพั‰ะฝะพัั‚ัŒ</td><td class="value">60W</td>
1224   - </tr>
1225   -
1226   - <tr class="full short">
1227   - <td class="name">ะฝะฐะฟั€ัะถะตะฝะธะต</td><td class="value">220 ะ’</td>
1228   - </tr>
1229   -
1230   - <tr class="full gray">
1231   - <td class="name">ะฒั‹ัะพั‚ะฐ</td><td class="value">686 ะผะผ</td>
1232   - </tr>
1233   -
1234   - <tr class="full short">
1235   - <td class="name">ัˆะธั€ะธะฝะฐ</td><td class="value">705 ะผะผ</td>
1236   - </tr>
1237   -
1238   - <tr class="full gray">
1239   - <td class="name">ั†ะฒะตั‚</td><td class="value">Burnished Silver</td>
1240   - </tr>
1241   -
1242   - <tr class="full short">
1243   - <td class="name">ะบะพะปะปะตะบั†ะธั</td><td class="value">Feiss</td>
1244   - </tr>
1245   -
1246   - </tbody>
1247   - </table>
1248   -
1249   -
1250   - <div class="table_title full short">
1251   - <span>ะžัะพะฑะตะฝะฝะพัั‚ะธ</span>
1252   - <i></i>
1253   - </div>
1254   - <table>
1255   - <tbody>
1256   -
1257   - <tr class="full gray">
1258   - <td><img src="http://www.linija-svitla.ua/res/images/attr_icons_adds/2_lamps_lamp_e14_candle.png" style="margin-top:2px;"/></td>
1259   - </tr>
1260   -
1261   -
1262   - </tbody>
1263   - </table>
1264   -
1265   - <div class="table_title full short">
1266   - <span>ะ ะฐัะฟะพะปะพะถะตะฝะธะต</span>
1267   - <i></i>
1268   - </div>
1269   - <table>
1270   - <tbody>
1271   - <tr class="full short gray">
1272   - <td>ะฒะฝัƒั‚ั€ะตะฝะฝะธะน</td>
1273   - </tr>
1274   - </tbody>
1275   - </table>
1276   -
1277   - <div class="table_title full short">
1278   - <span>ะกะตั€ะธั</span>
1279   - <i></i>
1280   - </div>
1281   - <table>
1282   - <tbody>
1283   - <tr class="full short gray">
1284   - <td>LEILA</td>
1285   - </tr>
1286   - </tbody>
1287   - </table>
1288   -
1289   - </div>
1290   - <div role="tabpanel" class="tab-pane" id="tab2">
1291   -
1292   - <div class="block-100">
1293   - [ ะžะฟะธัะฐะฝะธะต ะพั‚ััƒั‚ัั‚ะฒัƒะตั‚ ]
1294   - </div>
1295   -
1296   - </div>
1297   - </div>
1298   -
1299   - <div class="clearfix"></div>
1300   - <div class="collection">
1301   - <br />
1302   - <h2 id="collection">
1303   - ะšะพะปะปะตะบั†ะธั ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ <!--ะ”ะ•ะšะžะ ะ-->
1304   - </h2>
1305   - <div class="catalog_product_list view_table">
1306   -
1307   -
1308   -
1309   -
1310   -
1311   - <div class="catalog_item">
1312   - <div class="wrapper">
1313   - <div class="item_container">
1314   - <div class="title">
1315   - <a href="http://www.linija-svitla.ua/lyustra-elstead-fe-leila3-5893.htm">ะปัŽัั‚ั€ะฐ FE/LEILA3</a>
1316   - </div>
1317   - <div class="img">
1318   - <a href="http://www.linija-svitla.ua/lyustra-elstead-fe-leila3-5893.htm">
1319   - <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila3/5893_5.jpg" alt="ะปัŽัั‚ั€ะฐ FE/LEILA3" class="selected">
1320   - </a>
1321   - <div class="info_icons">
1322   - <a href="#" class="btn btnBuy buy_button" data-id="<?php echo $product->variant->product_variant_id; ?>" data-toggle="modal" data-target="#buyForm" lang="5893">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
1323   - <ul class="ul wishlike_block">
1324   - <li class="compare">
1325   - <a onclick="add2compare(); return false;" class="compare compare_text_link_5893" lang="5893" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
1326   - <span class="icon"></span>
1327   - </li>
1328   - <li class="like">
1329   - <a class="like like_text_link_5893" lang="5893" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
1330   - </li>
1331   - </ul>
1332   - </div>
1333   - </div>
1334   - <div class="price">
1335   - <div class="dlexfduinxipi">
1336   - ะฆะตะฝะฐ:
1337   - <span class="main"> 25794.00 <span class="currency">ะณั€ะฝ</span>
1338   - </span>
1339   - </div>
1340   - </div>
1341   - <div class="additional_info params">
1342   - </div>
1343   -
1344   -
1345   - <div class="opacity_bg"></div>
1346   - </div>
1347   - </div>
1348   - </div>
1349   -
1350   -
1351   -
1352   -
1353   - <div class="catalog_item">
1354   - <div class="wrapper">
1355   - <div class="item_container">
1356   - <div class="title">
1357   - <a href="http://www.linija-svitla.ua/elstead-fe-leila1c-6991.htm"> FE/LEILA1C</a>
1358   - </div>
1359   - <div class="img">
1360   - <a href="http://www.linija-svitla.ua/elstead-fe-leila1c-6991.htm">
1361   - <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila1c/6991_5.jpg" alt=" FE/LEILA1C" class="selected">
1362   - </a>
1363   - <div class="info_icons">
1364   - <a href="#" class="btn btnBuy buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="6991">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
1365   - <ul class="ul wishlike_block">
1366   - <li class="compare">
1367   - <a onclick="add2compare(); return false;" class="compare compare_text_link_6991" lang="6991" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
1368   - <span class="icon"></span>
1369   - </li>
1370   - <li class="like">
1371   - <a class="like like_text_link_6991" lang="6991" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
1372   - </li>
1373   - </ul>
1374   - </div>
1375   - </div>
1376   - <div class="price">
1377   - <div class="dlexfduinxipi">
1378   - ะฆะตะฝะฐ:
1379   - <span class="main"> 14330.40 <span class="currency">ะณั€ะฝ</span>
1380   - </span>
1381   - </div>
1382   - </div>
1383   - <div class="additional_info params">
1384   - </div>
1385   -
1386   -
1387   - <div class="opacity_bg"></div>
1388   - </div>
1389   - </div>
1390   - </div>
1391   -
1392   -
1393   -
1394   -
1395   - <div class="catalog_item">
1396   - <div class="wrapper">
1397   - <div class="item_container">
1398   - <div class="title">
1399   - <a href="http://www.linija-svitla.ua/nastennyy-svetilnik-elstead-fe-leila2-5894.htm">ะฝะฐัั‚ะตะฝะฝั‹ะน ัะฒะตั‚ะธะปัŒะฝะธะบ FE/LEILA2</a>
1400   - </div>
1401   - <div class="img">
1402   - <a href="http://www.linija-svitla.ua/nastennyy-svetilnik-elstead-fe-leila2-5894.htm">
1403   - <img src="http://www.linija-svitla.ua/gallery/prod/fe_leila2/5894_5.jpg" alt="ะฝะฐัั‚ะตะฝะฝั‹ะน ัะฒะตั‚ะธะปัŒะฝะธะบ FE/LEILA2" class="selected">
1404   - </a>
1405   - <div class="info_icons">
1406   - <a href="#" class="btn btnBuy buy_button" data-id="<?php echo $product->variant->product_variant_id; ?>" data-toggle="modal" data-target="#buyForm" lang="5894">ะšัƒะฟะธั‚ัŒ ัะฒะตั‚ะธะปัŒะฝะธะบ</a>
1407   - <ul class="ul wishlike_block">
1408   - <li class="compare">
1409   - <a onclick="add2compare(); return false;" class="compare compare_text_link_5894" lang="5894" href="#">ะš ัั€ะฐะฒะฝะตะฝะธัŽ</a>
1410   - <span class="icon"></span>
1411   - </li>
1412   - <li class="like">
1413   - <a class="like like_text_link_5894" lang="5894" href="#">ะ’ ะธะทะฑั€ะฐะฝะฝะพะต</a><span class="icon"></span>
1414   - </li>
1415   - </ul>
1416   - </div>
1417   - </div>
1418   - <div class="price">
1419   - <div class="dlexfduinxipi">
1420   - ะฆะตะฝะฐ:
1421   - <span class="main"> 8598.00 <span class="currency">ะณั€ะฝ</span>
1422   - </span>
1423   - </div>
1424   - </div>
1425   - <div class="additional_info params">
1426   - </div>
1427   -
1428   -
1429   - <div class="opacity_bg"></div>
1430   - </div>
1431   - </div>
1432   - </div>
  494 + <div class="opacity_bg"></div>
  495 + </div>
  496 + </div>
  497 + </div>
1433 498  
1434 499  
1435 500  
... ... @@ -1539,45 +604,6 @@
1539 604 </div>
1540 605  
1541 606  
1542   - <div class="container">
1543   - <div class="breadcrumbs" xmlns:v="http://rdf.data-vocabulary.org/">
1544   - <div class="container">
1545   - <div class="margin-left-right-10">
1546   - <ul class="ul">
1547   - <li class="bread_item has_childs has_link" style="z-index: 10;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
1548   - <a href="http://www.linija-svitla.ua/" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะ˜ะฝั‚ะตั€ะฝะตั‚-ะผะฐะณะฐะทะธะฝ ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ</span></a>
1549   - </li>
1550   -
1551   - <li class="arr bread_item">></li>
1552   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
1553   - <a href="http://www.linija-svitla.ua/lyustry-2.htm" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะปัŽัั‚ั€ั‹</span></a>
1554   - </li>
1555   - <li class="arr bread_item">></li>
1556   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
1557   - <a href="http://www.linija-svitla.ua/podvesnye-3439.htm" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะŸะพะดะฒะตัะฝั‹ะต</span></a>
1558   - </li>
1559   - <li class="arr bread_item">></li>
1560   - <li class="bread_item has_childs has_link" style="z-index: 9;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
1561   - <a href="http://www.linija-svitla.ua/podvesnye-3439.htm?fbrandlist=7" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">Elstead</span></a>
1562   - </li>
1563   - <li class="arr bread_item">></li>
1564   - <li class="bread_item" style="z-index: 6;">
1565   - <span class="last">Elstead FE/LEILA6</span>
1566   - </li>
1567   - </ul>
1568   - <div class="clearfix"></div>
1569   - </div>
1570   - </div>
1571   - </div>
1572   -
1573   - <style>
1574   - .breadcrumbs span.text{
1575   - text-transform:capitalize;
1576   - }
1577   - </style>
1578   - </div>
1579   -
1580   -
1581 607 </div>
1582 608  
1583 609 <div class="clearfix"></div>
... ...
frontend/views/catalog/products.php
  Show/Hide comments   View file @d09f430
... ... @@ -3,9 +3,21 @@
3 3 * @var $productProvider \yii\data\ActiveDataProvider
4 4 * @var View $this
5 5 */
6   -use frontend\widgets\FilterWidget;
  6 + use frontend\widgets\FilterWidget;
  7 +use frontend\widgets\Seo;
  8 +use yii\helpers\Url;
7 9 use yii\web\View;
8 10 use yii\widgets\ListView;
  11 + $this->params['seo']['title'] = !empty($category->meta_title) ? $category->meta_title : '';
  12 +
  13 + $this->params['seo']['fields']['meta-title'] = $category->meta_title;
  14 + $this->params['seo']['h1'] = !empty($category->h1) ? $category->h1 : $category->name;
  15 + $this->params['seo']['seo_text'] = $category->seo_text;
  16 + $this->params['seo']['description'] = $category->meta_desc;
  17 + $this->params['seo']['meta'] = $category->meta_robots;
  18 + $this->params['seo']['category_name'] = $category->name;
  19 +
  20 + $this->params['breadcrumbs'][] = $category->name;
9 21 ?>
10 22 <!-- ะขะฐะฑั‹ ะดะปั ัะปะฐะนะดะตั€ะฐ -->
11 23 <div class="bigSlidertabs fixed" style="position:fixed;">
... ... @@ -292,30 +304,8 @@ use frontend\widgets\FilterWidget;
292 304  
293 305  
294 306  
295   - <div class="wrapper white">
296   -
297   - <div class="container">
298   -
299   - <div class="breadcrumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
300   - <div class="container">
301   - <div class="margin-left-right-10">
302   - <ul class="ul">
303   - <li class="bread_item has_childs has_link" style="z-index: 10;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
304   - <a href="http://www.linija-svitla.ua/" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะ˜ะฝั‚ะตั€ะฝะตั‚-ะผะฐะณะฐะทะธะฝ ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ</span></a>
305   - </li>
306   - <li class="arr bread_item">></li>
307   - <li class="bread_item" style="z-index: 6;">
308   - <span class="last" style="text-transform:capitalize">ะปัŽัั‚ั€ั‹</span>
309   - </li>
310   - </ul>
311   - <div class="clearfix"></div>
312   - </div>
313   - </div>
314   - </div>
315   -
316 307  
317 308  
318   - </div>
319 309  
320 310 <div class="container">
321 311 <div class="block-25" style="position: relative;">
... ... @@ -465,7 +455,7 @@ use frontend\widgets\FilterWidget;
465 455  
466 456  
467 457  
468   - <h1 class="title">ะšั€ะฐัะธะฒั‹ะต ะปัŽัั‚ั€ั‹</h1>
  458 + <h1 class="title"><?= Seo::widget([ 'row'=>'h1'])?></h1>
469 459  
470 460  
471 461 <div class="list_filters_links">
... ... @@ -487,6 +477,7 @@ use frontend\widgets\FilterWidget;
487 477 </ul>
488 478 <ul class="ul sort_links">
489 479 <li>ะกะพั€ั‚ะธั€ะพะฒะบะฐ:</li>
  480 +
490 481 <li class="">
491 482 <a href="#" onclick="window.location.href='http://www.linija-svitla.ua/lyustry-2.htm?ipp=36&sort=price&so=asc'; return false;">ะพั‚ ะดะพั€ะพะณะธั…</a><span class="arr"></span>
492 483 </li>
... ... @@ -557,7 +548,12 @@ use frontend\widgets\FilterWidget;
557 548  
558 549 <?= ListView::widget([
559 550 'dataProvider' => $productProvider,
560   - 'itemView' => '_product_item',
  551 + 'itemView' => function ($model, $key, $index, $widget) use($category) {
  552 + return $this->render('_product_item',[
  553 + 'model' => $model,
  554 + 'category' => $category
  555 + ]);
  556 + },
561 557 'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
562 558 ])
563 559  
... ... @@ -613,25 +609,3 @@ use frontend\widgets\FilterWidget;
613 609 </div>
614 610  
615 611  
616   - <div class="container">
617   - <div class="breadcrumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
618   - <div class="container">
619   - <div class="margin-left-right-10">
620   - <ul class="ul">
621   - <li class="bread_item has_childs has_link" style="z-index: 10;" typeof="v:Breadcrumb" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
622   - <a href="http://www.linija-svitla.ua/" rel="v:url" property="v:title" itemprop="url"><span class="text" itemprop="title">ะ˜ะฝั‚ะตั€ะฝะตั‚-ะผะฐะณะฐะทะธะฝ ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ</span></a>
623   - </li>
624   - <li class="arr bread_item">></li>
625   - <li class="bread_item" style="z-index: 6;">
626   - <span class="last" style="text-transform:capitalize">ะปัŽัั‚ั€ั‹</span>
627   - </li>
628   - </ul>
629   - <div class="clearfix"></div>
630   - </div>
631   - </div>
632   - </div>
633   -
634   - </div>
635   -
636   -
637   - </div><!-- /.wrapper.white -->
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @d09f430
1 1 <?php
2 2  
  3 +use common\models\Basket;
3 4 use common\modules\product\models\Category;
4 5 use frontend\assets\AppAsset;
5 6 use yii\helpers\Html;
  7 +use yii\helpers\Url;
  8 +use yii\widgets\Breadcrumbs;
6 9  
7 10 AppAsset::register($this);
8 11  
... ... @@ -235,11 +238,29 @@ AppAsset::register($this);
235 238  
236 239  
237 240  
  241 +
238 242 <?= $this->render('main-menu')?>
  243 + <div class="wrapper white">
  244 + <div class="container">
  245 +
  246 +
  247 + <?= Breadcrumbs::widget ([
  248 + 'homeLink' => ['label' => 'ะ˜ะฝั‚ะตั€ะฝะตั‚-ะผะฐะณะฐะทะธะฝ ัะฒะตั‚ะธะปัŒะฝะธะบะพะฒ', 'url' => Url::to(['/']),'itemprop' => 'url', ],
  249 + 'itemTemplate' => "<li><span itemprop=\"title\">{link}</span></li>\n", // template for all links
  250 + 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
  251 + ])
  252 + ?>
  253 +
  254 +
  255 +
  256 +
  257 + </div>
239 258  
240 259 <?= $content ?>
241 260  
242 261  
  262 + </div><!-- /.wrapper.white -->
  263 +
243 264 <div class="container margin-bottom-10">
244 265 <div class="row">
245 266 <div class="facebook">
... ... @@ -880,89 +901,14 @@ AppAsset::register($this);
880 901  
881 902 <!-- Cart -->
882 903 <div class="modal fade" id="buyForm" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
883   - <div class="modal-dialog buy-product" role="document">
884   - <div class="modal-content">
885   -
886   - <div class="modal-header">
887   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
888   -
889   - <div class="modal-title" id="myModalLabel">
890   - <div class="h3">
891   - <span class="cart-icon"></span>
892   - <a href="#"><span class="cart_count">0</span> ั‚ะพะฒะฐั€(ะพะฒ)</a>
893   - ะฝะฐ ััƒะผะผัƒ <span class="cart_total">0</span><span class="currency">&nbsp;<!--ะณั€ะฝ.--></span>
894   - </div>
895   - </div>
896   -
897   - </div>
898   -
899   - <div class="modal-body">
900   -
901   - <table class="tovar">
902   - <tbody>
903   - <tr>
904   - <td class="left">
905   - <img src="http://www.linija-svitla.ua/images/i_no_photo.jpg" alt="">
906   - </td>
907   - <td class="right">
908   - <div class="title">[ ั‚ะพะฒะฐั€ ]</div>
909   - <div class="count_choise">
910   - <span class="minus-disabled"></span>
911   - <input type="text" name="count" value="0" class="prod_count">
912   - <span class="plus"></span>
913   - <span class="total_summ">= <span class="total_prod">0</span><span class="currency">&nbsp;<!--ะณั€ะฝ.--></span></span>
914   - </div>
915   - <input type="hidden" name="prod_id" value="" id="prod_id">
916   - </td>
917   - </tr>
918   - <tr>
919   - <td class="left">
920   - <a href="ordering.htm" class="btn">ะžั„ะพั€ะผะธั‚ัŒ ะทะฐะบะฐะท</a>
921   - </td>
922   - <td class="right">
923   - <div class="back_to_shop"><a data-dismiss="modal" aria-label="Close" href="javascript:false">ะฟั€ะพะดะพะปะถะธั‚ัŒ ะฟะพะบัƒะฟะบะธ</a></div>
924   - <p class="rettext">ั‚ะพะฒะฐั€ ัะพั…ั€ะฐะฝะธั‚ัั ะฒ ะบะพั€ะทะธะฝะต</p>
925   - </td>
926   - </tr>
927   - </tbody>
928   - </table>
929   - <br />
930   -
931   - </div>
932   -
933   - <div class="modal-footer">
934   -
935   - <div class="gray_part" id="buy_back_call_form">
936   - <p class="title">ะ—ะฐะบะฐะทะฐั‚ัŒ ะฑะตะท ะพั„ะพั€ะผะปะตะฝะธั</p>
937   - <p class="subtitle">ะœะพะถะฝะพ ะฝะต ะทะฐะฟะพะปะฝัั‚ัŒ ะฝะธะบะฐะบะธั… ั„ะพั€ะผ, ะฟั€ะพัั‚ะพ ะพัั‚ะฐะฒะธั‚ัŒ ั‚ะตะปะตั„ะพะฝ ะธ ะบะพะฝััƒะปัŒั‚ะฐะฝั‚ ั€ะตัˆะธั‚ ะฒัะต ะฒะพะฟั€ะพัั‹ ะฟะพ ะพั„ะพั€ะผะปะตะฝะธัŽ ะทะฐะบะฐะทะฐ.</p>
938   - <div class="back_call_form">
939   - <input type="tel" class="customerphone" name="customerphone" value="" placeholder="+38 (0XX) XXX-XX-XX">
940   - <span class="btn btn-gray disabled" id="buy_back_call_submit" disabled1="disabled1">ะถะดัƒ ะทะฒะพะฝะบะฐ</span>
941   - <span class="submit_indicator"></span>
942   - <div class="clr"></div>
943   - </div>
944   - <p class="phone-example">ะฝะฐะฟั€ะธะผะตั€: +38 (095) 282-85-08</p>
945   - </div>
946   -
947   - </div>
948   -
949   - </div>
950   - </div>
  904 + <?= $this->render('/basket/modal_items',[
  905 + 'basket'=>new Basket(),
  906 + 'models'=>[]
  907 + ])?>
951 908 </div>
952 909  
953 910  
954 911  
955   - <!-- EOF Cart -->
956   -
957   -
958   -
959   - <script>
960   -
961   - if (ga_exist) { // typeof ga === "function"
962   - ga('send', 'pageview');
963   - }
964   -
965   - </script>
966 912 <?php $this->endBody () ?>
967 913 </body>
968 914 </html>
... ...
frontend/views/order/_order_form.php 0 โ†’ 100644
  Show/Hide comments   View file @d09f430
  1 +<?php
  2 +use common\models\Orders;
  3 +use yii\helpers\Url;
  4 +use yii\widgets\ActiveForm;
  5 +
  6 +?>
  7 +<table border="0" cellspacing="1" cellpadding="2" align="center" style="cursor:default; width: 100%;">
  8 + <tbody>
  9 + <tr>
  10 + <td>
  11 +
  12 + <table border="0" cellspacing="0" cellpadding="5" id="tbl_cart" class="tbl_cart">
  13 +
  14 + <tbody><tr class="buttonsPanel topButtonsBox">
  15 + <td class="returnBtnCell" style="width: 220px;">
  16 + <div style="float: left;">
  17 +
  18 + <button name="submit_button" type="submit" class="btn btn-large" id="submit_button" data-toggle="modal" data-target="#myForm" onclick="return false;">ะžั„ะพั€ะผะธั‚ัŒ ะทะฐะบะฐะท</button>
  19 + </div>
  20 + </td>
  21 + <td class="confirmBtnCell">
  22 +
  23 + <div style="float: left;">
  24 + <button name="" type="button" class="btn btn-large return" id="" onclick="return location.href='javascript:history.back();';">
  25 + ะ’ะตั€ะฝัƒั‚ัŒัั ะบ ะฟะพะบัƒะฟะบะฐะผ
  26 + </button> </div>
  27 + </td>
  28 +
  29 + </tr>
  30 +
  31 + </tbody></table>
  32 +
  33 +
  34 +
  35 +
  36 +
  37 + <?php
  38 +
  39 +
  40 + foreach($models as $model) {
  41 + $item = $basket->getItem($model->product_variant_id);
  42 + ?>
  43 + <div class="order_item item_container" data-id="<?php echo $model->product_variant_id; ?>" >
  44 + <table border="0" cellspacing="0" cellpadding="5" id="tbl_cart" class="tbl_cart">
  45 +
  46 + <tbody><tr valign="top" id="ord_row_539" class="itemRow">
  47 +
  48 + <td rowspan="2" class="order_img">
  49 + <a target="_blank" href="<?= Url::to([
  50 + 'catalog/product',
  51 + 'product' => $model->product->alias
  52 + ]) ?>">
  53 + <div class="imgBorder">
  54 + <?php
  55 + echo \common\components\artboximage\ArtboxImageHelper::getImage($model->getImageUrl(), 'list');
  56 + ?>
  57 + </div>
  58 + </a>
  59 + </td>
  60 + <td class="iTitle" style="width: 450px;">
  61 + <a target="_blank" href="<?= Url::to([
  62 + 'catalog/product',
  63 + 'product' => $model->product->alias
  64 + ]) ?>">
  65 + <?= $model->getFullname() ?>
  66 + </a>
  67 +
  68 + </td>
  69 +
  70 + <td style=" vertical-align: top;">
  71 +
  72 + <table class="order_details">
  73 + <tbody>
  74 + <tr>
  75 + <td colspan="2">
  76 + <a class="del_order cart_remove" lang="539" title="ะฃะดะฐะปะธั‚ัŒ ั‚ะพะฒะฐั€">ัƒะดะฐะปะธั‚ัŒ ั‚ะพะฒะฐั€ <span>x</span></a>
  77 + </td>
  78 + </tr>
  79 + <tr>
  80 + <td>
  81 + ะฆะตะฝะฐ&nbsp;
  82 + </td>
  83 + <td>
  84 + <div class="iPriceOne">
  85 + <label class="price"><span><?= $item['price']?></span> ะณั€ะฝ.</label>
  86 + </div>
  87 + </td>
  88 + </tr>
  89 + <tr >
  90 + <td>
  91 + ะšะพะปะธั‡ะตัั‚ะฒะพ&nbsp;
  92 + </td>
  93 + <td>
  94 + <div class="count_choise">
  95 + <span class="minus"></span>
  96 + <input type="text" value="<?= $item['count']?>" class="small qtyInput prod_count" >
  97 + <span class="plus"></span>
  98 + </div>
  99 + </td>
  100 + </tr>
  101 + <tr>
  102 + <td>
  103 + Cัƒะผะผะฐ&nbsp;
  104 + </td>
  105 + <td>
  106 + <div class="iPrice">
  107 + <label id="cost" class="total_prod cost"><span><?= $item['count'] * $item['price']; ?></span> ะณั€ะฝ.</label> <!-- 00 ะบะพะฟ.-->
  108 + </div>
  109 + </td>
  110 + </tr>
  111 + </tbody>
  112 + </table>
  113 +
  114 + </td>
  115 +
  116 +
  117 + </tr>
  118 +
  119 + </tbody></table>
  120 +
  121 + </div>
  122 +
  123 + <?php
  124 + }
  125 + ?>
  126 +
  127 +
  128 +
  129 + <table border="0" cellspacing="0" cellpadding="5" id="tbl_cart" class="tbl_cart">
  130 + <tbody>
  131 +
  132 + <tr valign="bottom" class="totalPrice" style="text-align: right;">
  133 + <td colspan="2" align="right"> </td>
  134 + <td>
  135 + <span class="total_summ_name">ะกัƒะผะผะฐ ะทะฐะบะฐะทะฐ:</span>
  136 + <label id="total" class="cart_total"><span><?php echo $basket->getSum(); ?></span> ะณั€ะฝ.</label>
  137 + </td>
  138 + </tr>
  139 +
  140 +
  141 +
  142 + <tr>
  143 + <td colspan="6">
  144 +
  145 +
  146 + </td>
  147 + </tr>
  148 +
  149 +
  150 +
  151 + </tbody>
  152 + </table>
  153 +
  154 + </td>
  155 + </tr>
  156 + </tbody>
  157 +</table>
  158 +
  159 +<div class="modal fade" id="myForm" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
  160 + <div class="modal-dialog buy-product" role="document">
  161 + <div class="modal-content">
  162 +
  163 + <div class="modal-header">
  164 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  165 +
  166 + </div>
  167 +
  168 + <div class="modal-body">
  169 +
  170 + <?php $form = ActiveForm::begin(['action'=>['/order/save'],'id'=>'orderForm']); ?>
  171 +
  172 + <?= $form->field(new Orders(), 'name')->textInput() ?>
  173 +
  174 + <?= $form->field(new Orders(), 'phone')->textInput() ?>
  175 +
  176 + <?= $form->field(new Orders(), 'email') ?>
  177 +
  178 + <?= $form->field(new Orders(), 'comment')->textarea() ?>
  179 +
  180 + <button type="submit" class="pull-right btn btn-large btn-default">ะžั„ะพั€ะผะธั‚ัŒ</button>
  181 + <?php ActiveForm::end(); ?>
  182 + <div class="clearfix"></div>
  183 + <p><span style="color: red;">*</span> - ะพะฑัะทะฐั‚ะตะปัŒะฝั‹ะต ะฟะพะปั ะดะปั ะฒะฒะพะดะฐ</p>
  184 + </div>
  185 + </div>
  186 + </div>
  187 +</div>
  188 +
... ...
frontend/views/order/index.php 0 โ†’ 100644
  Show/Hide comments   View file @d09f430
  1 +<?php
  2 +
  3 +use yii\helpers\Html;
  4 +use yii\helpers\Url;
  5 +use common\models\Basket;
  6 +use common\modules\product\models\ProductVariant;
  7 +use yii\web\View;
  8 +
  9 +/**
  10 + * @var View $this
  11 + * @var ProductVariant[] $models
  12 + * @var Basket $basket
  13 + */
  14 +?>
  15 +<?php if ($flash = Yii::$app->session->getFlash ('success')): ?>
  16 + <div class="alert-success"><?= $flash ?></div>
  17 +<?php endif; ?>
  18 +<?php if ($flash = Yii::$app->session->getFlash ('error')): ?>
  19 + <div class="alert-error"><?= $flash ?></div>
  20 +<?php endif; ?>
  21 +<div class="container">
  22 +
  23 + <h1>ะšะพั€ะทะธะฝะฐ</h1>
  24 +
  25 +</div>
  26 +<div class="block-100">
  27 +
  28 + <div class="container">
  29 +
  30 + <div class="block-25">
  31 + <div class="catalogueLeft orderLeftPanel">
  32 +
  33 +
  34 + <div class="columnLeftInfo">
  35 + <!-- del_columnLeftInfo -->
  36 +
  37 +
  38 +
  39 +
  40 +
  41 + <table border="0" cellspacing="0" cellpadding="0" class="boxGen articleBox">
  42 + <tbody><tr class="bxhead">
  43 + <th class="bxhl"></th>
  44 + <th class="bxhc"><div class="h3">
  45 + <a href="view-articles/">ะกั‚ะฐั‚ัŒะธ</a>
  46 + </div></th>
  47 +
  48 + <th class="bxhr"></th>
  49 + </tr>
  50 +
  51 + <tr class="bxdelim">
  52 + <td></td>
  53 + <td></td>
  54 + <td></td>
  55 + </tr>
  56 + <tr class="bxmiddle">
  57 + <td class="bxl"></td>
  58 + <td class="bxc"> <div width="100%" class="articlesBox"><!-- cats_table-->
  59 + <div width="100%">
  60 + <div class="articleItem">
  61 + <span class="image">
  62 + </span>
  63 + <span align="left" class="title">
  64 + <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm">
  65 + ะ›ะธะฝะธั ัะฒะตั‚ะฐ ะฟั€ะตะดัั‚ะฐะฒะธะปะฐ ั‚ั€ะตะฝะดะพะฒั‹ะต ะผะพะดะตะปะธ ะฝะฐ Interior Mebel
  66 + </a>
  67 + </span>
  68 +
  69 + <div align="left" class="desc">
  70 + <p>ะ’ ะšะธะตะฒะต ะฟั€ะพัˆะปะฐ ะฒั‹ัั‚ะฐะฒะบะฐ Interior Mebel, ะบะพั‚ะพั€ะฐั ัƒะถะต ั‚ั€ะฐะดะธั†ะธะพะฝะฝะพ ัะพะฑะธั€ะฐะตั‚ ะปัƒั‡ัˆะธะต ะพะฑั€ะฐะทั†ั‹ ะดะธะทะฐะนะฝะฐ ะธะฝั‚ะตั€ัŒะตั€ะฐ. ะะฐ...
  71 + <a href="liniya-sveta-predstavila-trendovye-modeli-na-interior-mebel-85.htm">
  72 + ะฟะพะดั€ะพะฑะฝะตะต
  73 + </a>
  74 + </p></div>
  75 +
  76 + </div>
  77 +
  78 +
  79 + <div class="articleItem">
  80 + <span class="image">
  81 + </span>
  82 + <span align="left" class="title">
  83 + <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm">
  84 + ะกะฒะตั‚ะพะดะธะพะดะฝะพะต ะพัะฒะตั‰ะตะฝะธะต Light Topps | ะกะฒะตั‚ะพะดะธะพะดะฝั‹ะต...
  85 + </a>
  86 + </span>
  87 +
  88 + <div align="left" class="desc">
  89 + ะž ัะฒะตั‚ะพะดะธะพะดะฝั‹ั… ะปะฐะผะฟะฐั… ะธ ัะฒะตั‚ะธะปัŒะฝะธะบะฐั…, ะฒ ะบะพั‚ะพั€ั‹ั… ะธัะฟะพะปัŒะทัƒัŽั‚ัั ัะฒะตั‚ะพะดะธะพะดะฝั‹ะต ะผะพะดัƒะปะธ, ะฝะฐะฟะธัะฐะฝะพ ะฝะตะผะฐะปะพ ะธ ะฝะฐะฒะตั€ะฝัะบะฐ ัƒะถะต...
  90 + <a href="svetodiodnoe-osveschenie-light-topps-svetodiodnye-lampochki-lampy-colon-kupit-dlya-doma-ceny-v-ukraine-84.htm">
  91 + ะฟะพะดั€ะพะฑะฝะตะต
  92 + </a>
  93 + </div>
  94 +
  95 + </div>
  96 +
  97 +
  98 + <div class="articleItem">
  99 + <span class="image">
  100 + </span>
  101 + <span align="left" class="title">
  102 + <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm">
  103 + ะ›ัŽัั‚ั€ั‹ ะฟะพั‚ะพะปะพั‡ะฝั‹ะต. ะะพะฒั‹ะต ะฒะพะทะผะพะถะฝะพัั‚ะธ ัƒะฟั€ะฐะฒะปะตะฝะธั ัะฒะตั‚ะพะผ
  104 + </a>
  105 + </span>
  106 +
  107 + <div align="left" class="desc">
  108 + ะ›ัŽัั‚ั€ั‹ ะฟะพั‚ะพะปะพั‡ะฝั‹ะต ะพัะฝะฐั‰ะตะฝะฝั‹ะต ะฟัƒะปัŒั‚ะพะผ ะดะธัั‚ะฐะฝั†ะธะพะฝะฝะพะณะพ ัƒะฟั€ะฐะฒะปะตะฝะธั, ะฟะพะทะฒะพะปััŽั‚ ะฒะบะปัŽั‡ะฐั‚ัŒ/ะฒั‹ะบะปัŽั‡ะฐั‚ัŒ, ะฐ ั‚ะฐะบะถะต ั€ะตะณัƒะปะธั€ะพะฒะฐั‚ัŒ...
  109 + <a href="lyustry-potolochnye-novye-vozmojnosti-upravleniya-svetom-82.htm">
  110 + ะฟะพะดั€ะพะฑะฝะตะต
  111 + </a>
  112 + </div>
  113 +
  114 + </div>
  115 +
  116 +
  117 +
  118 +
  119 +
  120 +
  121 +
  122 +
  123 +
  124 +
  125 + <div style="clear: left;"></div>
  126 +
  127 +
  128 + </div>
  129 +
  130 +
  131 + </div></td>
  132 + <td class="bxr"></td>
  133 + </tr>
  134 + <tr class="bxbottom">
  135 + <td class="bxbl"></td>
  136 + <td class="bxbc"></td>
  137 + <td class="bxbr"></td>
  138 + </tr>
  139 + </tbody></table>
  140 +
  141 + <div class="clearfix"></div>
  142 +
  143 +
  144 + <!-- del_columnLeftInfo_end -->
  145 + </div>
  146 +
  147 +
  148 + </div>
  149 + </div>
  150 +
  151 + <div class="block-75">
  152 +
  153 + <div class="ordering_tbl">
  154 +
  155 +
  156 + <div id="ordersFrom" class="orderBox">
  157 +
  158 + <?= $this->render('_order_form',[
  159 + 'models'=>$models,
  160 + 'basket'=>$basket
  161 + ])?>
  162 +
  163 + </div>
  164 +
  165 + </div>
  166 +
  167 + </div>
  168 + </div>
  169 +</div>
0 170 \ No newline at end of file
... ...
frontend/views/order/success.php 0 โ†’ 100644
  Show/Hide comments   View file @d09f430
  1 +<h1>Go home</h1>
0 2 \ No newline at end of file
... ...
frontend/web/css/css_header.css
  Show/Hide comments   View file @d09f430
1   -
  1 +.form-group{
  2 + position: relative;
  3 +}
  4 +.required label:before {
  5 + display: block;
  6 + content: "*";
  7 + color: #d40000;
  8 + position: absolute;
  9 + top: 0px;
  10 + right: -7px;
  11 +}
2 12 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
3 13 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em
4 14 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,
... ...
frontend/web/js/artbox_basket.js
  Show/Hide comments   View file @d09f430
... ... @@ -46,7 +46,7 @@ var ArtboxBasket = (function () {
46 46 var cart = $('#top-cart-content');
47 47 var count = this.count;
48 48 if (count > 0) {
49   - $(cart).html('<span class="in_the_cart">ะ’ ะบะพั€ะทะธะฝะต</span><span id="in_cart_col">' + count + ' ั‚ะพะฒะฐั€' + ((count > 4) ? 'ะพะฒ' : ((count > 1) ? 'ะฐ' : '')) + '</span><br/><span id="in_cart_sum">ะฝะฐ ' + this.sum + ' </span><br/><div id="in_cart_a"><a class="btn" href="ordering.htm">ะพั„ะพั€ะผะธั‚ัŒ ะฟะพะบัƒะฟะบัƒ</a></div>');
  49 + $(cart).html('<div id="top-cart-info"><span class="in_the_cart">ะ’ ะบะพั€ะทะธะฝะต</span><span id="in_cart_col">' + count + ' ั‚ะพะฒะฐั€' + ((count > 4) ? 'ะพะฒ' : ((count > 1) ? 'ะฐ' : '')) + '</span><br/><span id="in_cart_sum">ะฝะฐ ' + this.sum + ' </span><br/></div><div id="in_cart_a"><a class="btn" href="/order">ะพั„ะพั€ะผะธั‚ัŒ ะฟะพะบัƒะฟะบัƒ</a></div>');
50 50 }
51 51 else {
52 52 $(cart).html('<p class="empty-cart">ะšะพั€ะทะธะฝะฐ ะฟัƒัั‚ะฐ</p>');
... ... @@ -71,5 +71,5 @@ var ArtboxBasket = (function () {
71 71 configurable: true
72 72 });
73 73 return ArtboxBasket;
74   -}());
  74 +})();
75 75 //# sourceMappingURL=artbox_basket.js.map
76 76 \ No newline at end of file
... ...
frontend/web/js/artbox_basket.js.map
  Show/Hide comments   View file @d09f430
1   -{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"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"}
2 1 \ No newline at end of file
  2 +{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":["ArtboxBasket","ArtboxBasket.constructor","ArtboxBasket.items","ArtboxBasket.add","ArtboxBasket.set","ArtboxBasket.updateModal","ArtboxBasket.updateCart","ArtboxBasket.count","ArtboxBasket.sum"],"mappings":"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"}
3 3 \ No newline at end of file
... ...
frontend/web/js/artbox_basket.ts
  Show/Hide comments   View file @d09f430
... ... @@ -42,7 +42,7 @@ class ArtboxBasket {
42 42 var cart = $('#top-cart-content');
43 43 var count = this.count;
44 44 if(count > 0) {
45   - $(cart).html('<span class="in_the_cart">ะ’ ะบะพั€ะทะธะฝะต</span><span id="in_cart_col">' + count + ' ั‚ะพะฒะฐั€' + ((count > 4) ? 'ะพะฒ' : ((count > 1) ? 'ะฐ' : '')) + '</span><br/><span id="in_cart_sum">ะฝะฐ ' + this.sum + ' </span><br/><div id="in_cart_a"><a class="btn" href="ordering.htm">ะพั„ะพั€ะผะธั‚ัŒ ะฟะพะบัƒะฟะบัƒ</a></div>');
  45 + $(cart).html('<div id="top-cart-info"><span class="in_the_cart">ะ’ ะบะพั€ะทะธะฝะต</span><span id="in_cart_col">' + count + ' ั‚ะพะฒะฐั€' + ((count > 4) ? 'ะพะฒ' : ((count > 1) ? 'ะฐ' : '')) + '</span><br/><span id="in_cart_sum">ะฝะฐ ' + this.sum + ' </span><br/></div><div id="in_cart_a"><a class="btn" href="/order">ะพั„ะพั€ะผะธั‚ัŒ ะฟะพะบัƒะฟะบัƒ</a></div>');
46 46 } else {
47 47 $(cart).html('<p class="empty-cart">ะšะพั€ะทะธะฝะฐ ะฟัƒัั‚ะฐ</p>');
48 48 }
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @d09f430
1 1 var artbox_basket = new ArtboxBasket();
  2 +
  3 +/*order basket form js logic*/
  4 +
  5 +var recountPrice = function(container,new_value){
  6 + var new_price = +$(container).find('.price span').html() * new_value;
  7 + $(container).find('.cost span').html(new_price);
  8 + var total_price = 0;
  9 + $('#orderFrom').find('#cost span').each(function(){
  10 + total_price += +$(this).html();
  11 + });
  12 +
  13 + var total = $('#total span').html(total_price);
  14 +};
  15 +
  16 +$(document).on('click', '#ordersFrom .count_choise .plus', function(e) {
  17 + e.preventDefault();
  18 + var container = $(this).parents('.order_item');
  19 + var input = $(container).find('.prod_count');
  20 + var value = $(input).val();
  21 + var new_value = parseInt(value) + 1;
  22 + $(input).val(new_value);
  23 + $(input).trigger('change');
  24 + recountPrice(container,new_value);
  25 +
  26 +});
  27 +
  28 +$(document).on('click', '#ordersFrom .count_choise .minus', function(e) {
  29 + e.preventDefault();
  30 + var container = $(this).parents('.order_item');
  31 + var input = $(container).find('.prod_count');
  32 + var value = $(input).val();
  33 + if(value > 1 ){
  34 + var new_value = parseInt(value) - 1;
  35 + $(input).val(new_value);
  36 + $(input).trigger('change');
  37 + recountPrice(container,new_value);
  38 + }
  39 +
  40 +});
  41 +
  42 +$(document).on('change', '#ordersFrom .prod_count', function(e) {
  43 + e.preventDefault();
  44 + var container = $(this).parents('.order_item');
  45 + var new_value = $(this).val();
  46 + recountPrice(container,new_value);
  47 + var product_variant_id = container.data('id');
  48 + var value = $(this).val();
  49 + if(value < 0) {
  50 + value = 0;
  51 + }
  52 + artbox_basket.set(product_variant_id, value);
  53 +});
  54 +
  55 +
  56 +
  57 +$(document).on('click', '#ordersFrom .cart_remove', function(e) {
  58 + e.preventDefault();
  59 + var container = $(this).parents('.order_item');
  60 +
  61 + var id = $(container).data('id');
  62 + container.remove();
  63 + artbox_basket.set(id, 0);
  64 +});
  65 +
  66 +
  67 +/*end order basket form js logic*/
  68 +
  69 +
  70 +
2 71 $(document).on('click', '.buy_button', function(e) {
3 72 e.preventDefault();
4 73 var product_variant_id = $(this).data('id');
... ... @@ -14,6 +83,7 @@ $(document).on(&#39;change&#39;, &#39;#buyForm .prod_count&#39;, function(e) {
14 83 }
15 84 artbox_basket.set(product_variant_id, value);
16 85 });
  86 +
17 87 $(document).on('click', '#buyForm .count_choise .minus', function(e) {
18 88 e.preventDefault();
19 89 var container = $(this).parents('tr');
... ... @@ -23,6 +93,8 @@ $(document).on(&#39;click&#39;, &#39;#buyForm .count_choise .minus&#39;, function(e) {
23 93 $(input).val(new_value);
24 94 $(input).trigger('change');
25 95 });
  96 +
  97 +
26 98 $(document).on('click', '#buyForm .count_choise .plus', function(e) {
27 99 e.preventDefault();
28 100 var container = $(this).parents('tr');
... ... @@ -32,13 +104,18 @@ $(document).on(&#39;click&#39;, &#39;#buyForm .count_choise .plus&#39;, function(e) {
32 104 $(input).val(new_value);
33 105 $(input).trigger('change');
34 106 });
35   -$(document).on('click', '#top-cart', function() {
  107 +
  108 +
  109 +$(document).on('click', '#top-cart-info', function() {
36 110 if(artbox_basket.count > 0) {
37   - $('#buyForm').modal('show');
  111 + location.href='/order'
38 112 }
39 113 });
  114 +
40 115 $(document).on('click', '#buyForm .cart_remove', function() {
41 116 var container = $(this).parents('tr');
42 117 var id = $(container).data('id');
43 118 artbox_basket.set(id, 0);
44   -});
45 119 \ No newline at end of file
  120 +});
  121 +
  122 +
... ...