diff --git a/common/models/Basket.php b/common/models/Basket.php index 510d57e..b54b0a1 100755 --- a/common/models/Basket.php +++ b/common/models/Basket.php @@ -117,5 +117,9 @@ ->all(); } - + public function clear() + { + $this->setData([]); + } + } \ No newline at end of file diff --git a/frontend/controllers/OrderController.php b/frontend/controllers/OrderController.php index a2e2068..ec33e10 100755 --- a/frontend/controllers/OrderController.php +++ b/frontend/controllers/OrderController.php @@ -1,169 +1,220 @@ basket; - $data = $basket->getData(); - $models = $basket->findModels(array_keys($data)); - return $this->render('index', [ - 'models' => $models, - 'basket' => $basket, - ]); - } - - - /** - * - * @return string - */ - public function actionSave() + + namespace frontend\controllers; + + use common\models\Customer; + use common\models\OrdersProducts; + use common\widgets\Mailer; + use Yii; + use yii\base\InvalidConfigException; + use yii\base\InvalidParamException; + use yii\helpers\ArrayHelper; + use yii\web\Controller; + use common\models\Basket; + use common\modules\product\models\ProductVariant; + use common\models\Orders; + + class OrderController extends Controller { - $modelOrder = new Orders; + + public function actionIndex() + { + $basket = \Yii::$app->basket; + $data = $basket->getData(); + $models = $basket->findModels(array_keys($data)); + return $this->render('index', [ + 'models' => $models, + 'basket' => $basket, + ]); + } + /** - * @var $basket Basket + * @return string */ - $basket = \Yii::$app->basket; - $productV = $basket->getData(); - if(!empty($productV) && $modelOrder->load(Yii::$app->request->post())&& $modelOrder->save()){ - foreach ($productV as $index=>$row) { - $modelOrdersProducts = new OrdersProducts(); - $mod_id = $index; - $product = ProductVariant::findOne($mod_id); - /** - * Проверяем товар на наличие - */ - if(!$product->stock > 0 || !$product->price > 0 ){ - /** - * Добавляем сообщение об ошибке - */ - \Yii::$app->getSession()->setFlash('error', 'К сожалению товара '.$product->name . ' нет в наличии'); - $basket->delete($product->product_variant_id); - unset($productV[$index]); - }else { + public function actionSave() + { + $modelOrder = new Orders; + /** + * @var $basket Basket + */ + $basket = \Yii::$app->basket; + $productV = $basket->getData(); + if(!empty( $productV ) && $modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) { + foreach($productV as $index => $row) { + $modelOrdersProducts = new OrdersProducts(); + $mod_id = $index; + $product = ProductVariant::findOne($mod_id); /** - * Удаляем товар с массива и сохраняем в заказ + * Проверяем товар на наличие */ - $modelOrdersProducts->order_id = $modelOrder->id; - $modelOrdersProducts->product_name = $product->product->name; - $modelOrdersProducts->name = $product->name; - $modelOrdersProducts->price = $productV[$index]['price']; - $modelOrdersProducts->count= $productV[$index]['count']; - $modelOrdersProducts->sum_cost = $productV[$index]['price'] *$productV[$index]['count'] ; - $modelOrdersProducts->mod_id = $mod_id; - $modelOrdersProducts->sku = $product->sku; - $modelOrdersProducts->validate(); - $modelOrdersProducts->save(); - $productV[$index] = ArrayHelper::toArray($modelOrdersProducts); - $productV[$index]['img'] = \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list'); + if(!$product->stock > 0 || !$product->price > 0) { + /** + * Добавляем сообщение об ошибке + */ + \Yii::$app->getSession() + ->setFlash('error', 'К сожалению товара ' . $product->name . ' нет в наличии'); + $basket->delete($product->product_variant_id); + unset( $productV[ $index ] ); + } else { + /** + * Удаляем товар с массива и сохраняем в заказ + */ + $modelOrdersProducts->order_id = $modelOrder->id; + $modelOrdersProducts->product_name = $product->product->name; + $modelOrdersProducts->name = $product->name; + $modelOrdersProducts->price = $productV[ $index ][ 'price' ]; + $modelOrdersProducts->count = $productV[ $index ][ 'count' ]; + $modelOrdersProducts->sum_cost = $productV[ $index ][ 'price' ] * $productV[ $index ][ 'count' ]; + $modelOrdersProducts->mod_id = $mod_id; + $modelOrdersProducts->sku = $product->sku; + $modelOrdersProducts->validate(); + $modelOrdersProducts->save(); + $productV[ $index ] = ArrayHelper::toArray($modelOrdersProducts); + $productV[ $index ][ 'img' ] = \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list'); + } } - } - /** - * Сохраняем заказ - */ - if(!Yii::$app->user->id && !empty($modelOrder->email)){ - $modelUser = new Customer(); - $modelUser->role = 'person'; - $modelUser->username = $modelOrder->email; - $modelUser->name = $modelOrder->name; - $modelUser->phone = $modelOrder->phone; - $modelUser->password = Yii::$app->getSecurity()->generateRandomString(10); - $modelUser->group_id = 2; - $modelUser->save(); - } - $order = clone $modelOrder; - /** - * Чистим сессию корзины - */ - $modelOrder->clearBasket(); - Mailer::widget( - ['type' => 'order', - 'subject'=> 'Спасибо за покупку', - 'email' => $modelOrder->email, - 'params' => [ - 'order' => $order, + /** + * Сохраняем заказ + */ + if(!Yii::$app->user->id && !empty( $modelOrder->email )) { + $modelUser = new Customer(); + $modelUser->role = 'person'; + $modelUser->username = $modelOrder->email; + $modelUser->name = $modelOrder->name; + $modelUser->phone = $modelOrder->phone; + $modelUser->password = Yii::$app->getSecurity() + ->generateRandomString(10); + $modelUser->group_id = 2; + $modelUser->save(); + } + $order = clone $modelOrder; + /** + * Чистим сессию корзины + */ + $modelOrder->clearBasket(); + Mailer::widget([ + 'type' => 'order', + 'subject' => 'Спасибо за покупку', + 'email' => $modelOrder->email, + 'params' => [ + 'order' => $order, 'variants' => $productV, - ] + ], ]); - //$text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15"; - //Yii::$app->sms->send($order->phone, $text); - Yii::$app->session['order_data']= ['order' => $order,'variants'=>$productV]; - return $this->redirect(['order/success']); + //$text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15"; + //Yii::$app->sms->send($order->phone, $text); + Yii::$app->session[ 'order_data' ] = [ 'order' => $order, + 'variants' => $productV, + ]; + return $this->redirect([ 'order/success' ]); + } + $data = $basket->getData(); + $models = $basket->findModels(array_keys($data)); + return $this->render('index', [ + 'models' => $models, + 'basket' => $basket, + ]); } - $data = $basket->getData(); - $models = $basket->findModels(array_keys($data)); - return $this->render('index', [ - 'models' => $models, - 'basket' => $basket - ]); - } - - public function actionSuccess(){ - return $this->render('success'); - } - - public function actionQuick() { - $response = \Yii::$app->response; - $request = \Yii::$app->request; - $response->format = $response::FORMAT_JSON; - $product_variant_id = (int) $request->post('product_variant_id'); - $orders = new Orders([ - 'scenario' => Orders::SCENARIO_QUICK, - 'name' => 'Покупка в 1 клик', - ]); - if(!empty($product_variant_id)) { + + public function actionSuccess() + { + return $this->render('success'); + } + + public function actionQuick() + { + $response = \Yii::$app->response; + $request = \Yii::$app->request; + $response->format = $response::FORMAT_JSON; + $product_variant_id = (int) $request->post('product_variant_id'); + $orders = new Orders([ + 'scenario' => Orders::SCENARIO_QUICK, + 'name' => 'Покупка в 1 клик', + ]); + if(!empty( $product_variant_id )) { + /** + * @var ProductVariant $product_variant + */ + $product_variant = ProductVariant::findOne($product_variant_id); + } else { + throw new InvalidParamException('Не указан товар'); + } + if(!empty( $product_variant ) && $orders->load($request->post()) && $orders->save()) { + if($product_variant->stock <= 0 || $product_variant->price <= 0) { + $orders->delete(); + return [ + 'error' => 'К сожалению товара ' . $product_variant->name . ' нет в наличии', + ]; + } else { + $order_product = new OrdersProducts([ + 'order_id' => $orders->id, + 'product_name' => $product_variant->product->name, + 'name' => $product_variant->name, + 'price' => $product_variant->price, + 'count' => 1, + 'sum_cost' => $product_variant->price, + 'mod_id' => $product_variant->product_variant_id, + 'sku' => $product_variant->sku, + ]); + $order_product->save(); + return [ + 'result' => 'Спасибо за заказ! Наши менеджеры свяжутся с Вами в ближайшее время.', + ]; + } + } else { + throw new InvalidConfigException('Товар не найден или не удалось загрузить данные о покупателе.'); + } + } + + public function actionQuickBasket() + { + $response = \Yii::$app->response; + $request = \Yii::$app->request; + $response->format = $response::FORMAT_JSON; /** - * @var ProductVariant $product_variant + * @var array $data */ - $product_variant = ProductVariant::findOne($product_variant_id); - } else { - throw new InvalidParamException('Не указан товар'); - } - if(!empty($product_variant) && $orders->load($request->post()) && $orders->save()) { - if($product_variant->stock <= 0 || $product_variant->price <= 0) { - $orders->delete(); - return [ - 'error' => 'К сожалению товара '.$product_variant->name.' нет в наличии', - ]; + $data = \Yii::$app->basket->getData(); + $orders = new Orders([ + 'scenario' => Orders::SCENARIO_QUICK, + 'name' => 'Покупка в 1 клик', + ]); + if(!empty( $data )) { + /** + * @var ProductVariant[] $product_variants + * @var OrdersProducts[] $order_products + */ + $product_variants = []; + $order_products = []; + foreach($data as $product_variant_id => $item) { + $product_variant = ProductVariant::findOne($product_variant_id); + if(!empty($product_variant) && $product_variant->stock > 0 && $product_variant->price > 0) { + $product_variants[$product_variant_id] = $product_variant; + $order_products[$product_variant_id] = new OrdersProducts([ + 'product_name' => $product_variant->product->name, + 'name' => $product_variant->name, + 'price' => $product_variant->price, + 'count' => $item['count'], + 'sum_cost' => $item['count'] * $product_variant->price, + 'mod_id' => $product_variant->product_variant_id, + 'sku' => $product_variant->sku, + ]); + } + } } else { - $order_product = new OrdersProducts([ - 'order_id' => $orders->id, - 'product_name' => $product_variant->product->name, - 'name' => $product_variant->name, - 'price' => $product_variant->price, - 'count' => 1, - 'sum_cost' => $product_variant->price, - 'mod_id' => $product_variant->product_variant_id, - 'sku' => $product_variant->sku, - ]); - $order_product->save(); + throw new InvalidParamException('Не указан товар'); + } + if(!empty( $order_products ) && $orders->load($request->post()) && $orders->save()) { + foreach($order_products as $order_product) { + $order_product->order_id = $orders->id; + $order_product->save(); + } + \Yii::$app->basket->clear(); return [ - 'result' => 'Спасибо за заказ! Наши менеджеры свяжутся с Вами в ближайшее время.' + 'result' => 'Спасибо за заказ! Наши менеджеры свяжутся с Вами в ближайшее время.', ]; + } else { + throw new InvalidConfigException('Товар не найден или не удалось загрузить данные о покупателе.'); } - } else { - throw new InvalidConfigException('Товар не найден или не удалось загрузить данные о покупателе.'); } - } - -} diff --git a/frontend/views/basket/modal_items.php b/frontend/views/basket/modal_items.php index 34ee48b..4749bd0 100755 --- a/frontend/views/basket/modal_items.php +++ b/frontend/views/basket/modal_items.php @@ -1,9 +1,12 @@ getSum(); ?>  - -
- product_variant_id; ?>">
getImageUrl()); + echo Html::img($model->getImageUrl()); ?> -
getFullname();?>
+
getFullname(); ?>
- + = getItem($model->product_variant_id); - echo $item['count'] * $item['price']; + echo $item[ 'count' ] * $item[ 'price' ]; ?>   @@ -64,8 +64,8 @@ use yii\web\View; ?>
- 'btn'])?> - + 'btn' ]) ?> +
@@ -77,18 +77,39 @@ use yii\web\View;

-
-
-

Заказать без оформления

Можно не заполнять никаких форм, просто оставить телефон и консультант решит все вопросы по оформлению заказа.

- - жду звонка - + Orders::SCENARIO_QUICK, + ]); + $form = ActiveForm::begin([ + 'id' => 'quickbuy-modal', + ]); + echo $form->field($quickbuy, 'phone', [ + 'selectors' => [ + 'input' => '#order-phone-modal', + ], + ]) + ->widget(MaskedInput::className(), [ + 'mask' => '+38(999)999-99-99', + 'options' => [ + 'type' => 'tel', + 'class' => 'customerphone', + 'id' => 'order-phone-modal', + ], + ]) + ->label(false); + echo Html::submitInput('жду звонка', [ 'class' => 'btn btn-info' ]); + echo Html::tag('span', '', [ + 'class' => 'submit_indicator', + ]); + $form::end(); + ?>

например: +38 (095) 282-85-08

diff --git a/frontend/web/js/artbox_basket.js b/frontend/web/js/artbox_basket.js index 2e463aa..83df4af 100755 --- a/frontend/web/js/artbox_basket.js +++ b/frontend/web/js/artbox_basket.js @@ -65,5 +65,5 @@ var ArtboxBasket = (function () { configurable: true }); return ArtboxBasket; -})(); +}()); //# sourceMappingURL=artbox_basket.js.map \ No newline at end of file diff --git a/frontend/web/js/artbox_basket.js.map b/frontend/web/js/artbox_basket.js.map index 894ec91..ac4a41e 100755 --- a/frontend/web/js/artbox_basket.js.map +++ b/frontend/web/js/artbox_basket.js.map @@ -1 +1 @@ -{"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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"} \ No newline at end of file +{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 97cdc01..9d9423c 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -224,4 +224,21 @@ $(document).on('submit', '#quickbuy-form', function(e) { } }) }); +$(document).on('submit', '#quickbuy-modal', function(e) +{ + e.preventDefault(); + var form = $('#buyForm'); + $.post('/order/quick-basket', $(this).serialize(), function(data) + { + if(!data.error) { + $(form).find('.modal-body').html(data.result); + } else { + $(form).find('.modal-body').html(data.error); + } + }).fail(function(jqXHR, textStatus, errorThrown) { + $(form).find('.modal-body').html(JSON.parse(jqXHR.responseText).message); + }); + $(form).find('.modal-title').remove(); + $(form).find('.modal-footer').remove(); +}); /* End ajax form submit */ \ No newline at end of file -- libgit2 0.21.4