From d76d8bd1292b62b971792c047d04828f6c74788a Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 19 Jun 2019 21:18:16 +0530
Subject: [PATCH 1/4] flash message for discount & error

---
 packages/Webkul/Discount/src/Helpers/Discount.php   | 13 +++++++++----
 .../Webkul/Product/src/Helpers/ProductImage.php     |  2 +-
 .../src/Resources/views/checkout/onepage.blade.php  | 12 ++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php
index 1b041ed7d..5cc053c97 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Discount.php
@@ -327,11 +327,16 @@ abstract class Discount
         $result = true;
 
         foreach ($conditions as $condition) {
-            $actual_value = ${$condition->attribute};
-            $test_value = $condition->value;
-            $test_condition = $condition->condition;
+            if (isset($condition->attribute))
+                $actual_value = ${$condition->attribute};
 
-            if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') {
+            if (isset($condition->value))
+                $test_value = $condition->value;
+
+            if (isset($condition->condition))
+                $test_condition = $condition->condition;
+
+            if (isset($condition->type) && ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text')) {
                 if ($test_condition == '=') {
                     if ($actual_value != $test_value) {
                         $result = false;
diff --git a/packages/Webkul/Product/src/Helpers/ProductImage.php b/packages/Webkul/Product/src/Helpers/ProductImage.php
index cc62c1a9d..bd0fe1b7e 100755
--- a/packages/Webkul/Product/src/Helpers/ProductImage.php
+++ b/packages/Webkul/Product/src/Helpers/ProductImage.php
@@ -32,7 +32,7 @@ class ProductImage extends AbstractProduct
             ];
         }
 
-        if (! count($images)) {
+        if (! $product->parent_id && ! count($images)) {
             $images[] = [
                 'small_image_url' => asset('vendor/webkul/ui/assets/images/product/small-product-placeholder.png'),
                 'medium_image_url' => asset('vendor/webkul/ui/assets/images/product/meduim-product-placeholder.png'),
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index aa13372fa..521af556b 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -519,7 +519,11 @@
                         .then(function(response) {
                             this_this.$emit('onApplyCoupon')
                         })
-                        .catch(function(error) {});
+                        .catch(function(error) {
+                            window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}];
+
+                            this_this.$root.addFlashMessages();
+                        });
                 },
 
                 removeCoupon: function () {
@@ -529,7 +533,11 @@
                         .then(function(response) {
                             this_this.$emit('onRemoveCoupon')
                         })
-                        .catch(function(error) {});
+                        .catch(function(error) {
+                            window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}];
+
+                            this_this.$root.addFlashMessages();
+                        });
                 }
             }
         })

From f72529f0fbf76eac48096903737e0c04fb8eb840 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 20 Jun 2019 12:17:11 +0530
Subject: [PATCH 2/4] issue of discount amount in order #1053

---
 .../Admin/src/Resources/views/sales/orders/view.blade.php | 2 +-
 packages/Webkul/Checkout/src/Cart.php                     | 2 ++
 .../views/customers/account/orders/view.blade.php         | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index efab09d67..4fb15debd 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -250,7 +250,7 @@
                                                     <td>
                                                         {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }}
                                                     </td>
-                                                    
+
                                                     <td>
                                                         {{ $item->name }}
 
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index e8d596450..d5e023ae1 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -1059,6 +1059,8 @@ class Cart {
             'base_sub_total' => $data['base_sub_total'],
             'tax_amount' => $data['tax_total'],
             'base_tax_amount' => $data['base_tax_total'],
+            'discount_amount' => $data['discount_amount'],
+            'base_discount_amount' => $data['base_discount_amount'],
 
             'shipping_address' => array_except($data['shipping_address'], ['id', 'cart_id']),
             'billing_address' => array_except($data['billing_address'], ['id', 'cart_id']),
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index c4c32c12f..04299ffdc 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -113,6 +113,14 @@
                                                 <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
                                             </tr>
 
+                                            @if ($order->base_discount_amount > 0)
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            @endif
+
                                             <tr class="border">
                                                 <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
                                                 <td>-</td>

From 048585853dbdf72f6c79510cd17a67e0acced649 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 20 Jun 2019 15:12:28 +0530
Subject: [PATCH 3/4] repository insted of model in attribute create & edit for
 locale

---
 .../views/catalog/attributes/create.blade.php          |  8 ++++----
 .../Resources/views/catalog/attributes/edit.blade.php  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
index 4880699a3..9d89941d7 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
@@ -78,7 +78,7 @@
                                 <span class="control-error" v-if="errors.has('admin_name')">@{{ errors.first('admin_name') }}</span>
                             </div>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
 
                                 <div class="control-group">
                                     <label for="locale-{{ $locale->code }}">{{ $locale->name . ' (' . $locale->code . ')' }}</label>
@@ -251,7 +251,7 @@
 
                             <th>{{ __('admin::app.catalog.attributes.admin_name') }}</th>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
 
                                 <th>{{ $locale->name . ' (' . $locale->code . ')' }}</th>
 
@@ -280,7 +280,7 @@
                                 </div>
                             </td>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
                                 <td>
                                     <div class="control-group" :class="[errors.has(localeInputName(row, '{{ $locale->code }}')) ? 'has-error' : '']">
                                         <input type="text" v-validate="'{{ app()->getLocale() }}' == '{{ $locale->code }}' ? 'required': ''"  v-model="row['{{ $locale->code }}']" :name="localeInputName(row, '{{ $locale->code }}')" class="control" data-vv-as="&quot;{{ $locale->name . ' (' . $locale->code . ')' }}&quot;"/>
@@ -356,7 +356,7 @@
                     var rowCount = this.optionRowCount++;
                     var row = {'id': 'option_' + rowCount};
 
-                    @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                    @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
                         row['{{ $locale->code }}'] = '';
                     @endforeach
 
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
index b1a10d63b..908613e2f 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@@ -101,7 +101,7 @@
                                 <span class="control-error" v-if="errors.has('admin_name')">@{{ errors.first('admin_name') }}</span>
                             </div>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
 
                                 <div class="control-group">
                                     <label for="locale-{{ $locale->code }}">{{ $locale->name . ' (' . $locale->code . ')' }}</label>
@@ -309,7 +309,7 @@
 
                             <th>{{ __('admin::app.catalog.attributes.admin_name') }}</th>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
 
                                 <th>{{ $locale->name . ' (' . $locale->code . ')' }}</th>
 
@@ -339,7 +339,7 @@
                                 </div>
                             </td>
 
-                            @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                            @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
                                 <td>
                                     <div class="control-group" :class="[errors.has(localeInputName(row, '{{ $locale->code }}')) ? 'has-error' : '']">
                                         <input type="text" v-validate="'{{ app()->getLocale() }}' == '{{ $locale->code }}' ? 'required': ''" v-model="row['{{ $locale->code }}']" :name="localeInputName(row, '{{ $locale->code }}')" class="control" data-vv-as="&quot;{{ $locale->name . ' (' . $locale->code . ')' }}&quot;"/>
@@ -397,7 +397,7 @@
                             'swatch_value_url': '{{ $option->swatch_value_url }}'
                         };
 
-                    @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                    @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
                         row['{{ $locale->code }}'] = "{{ $option->translate($locale->code)['label'] }}";
                     @endforeach
 
@@ -420,7 +420,7 @@
                     var rowCount = this.optionRowCount++;
                     var row = {'id': 'option_' + rowCount};
 
-                    @foreach (Webkul\Core\Models\Locale::all() as $locale)
+                    @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
                         row['{{ $locale->code }}'] = '';
                     @endforeach
 

From 12846df91c1562a4955a33a3e4e570e8c0e07b74 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 20 Jun 2019 17:49:14 +0530
Subject: [PATCH 4/4] quantity issue in discount

---
 packages/Webkul/Discount/src/Actions/BuyAGetB.php         | 2 ++
 packages/Webkul/Discount/src/Actions/FixedAmount.php      | 2 ++
 packages/Webkul/Discount/src/Actions/PercentOfProduct.php | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/packages/Webkul/Discount/src/Actions/BuyAGetB.php b/packages/Webkul/Discount/src/Actions/BuyAGetB.php
index 5ba164830..21d8a5475 100644
--- a/packages/Webkul/Discount/src/Actions/BuyAGetB.php
+++ b/packages/Webkul/Discount/src/Actions/BuyAGetB.php
@@ -23,6 +23,8 @@ class BuyAGetB extends Action
 
             if ($realQty > $disc_quantity) {
                 $amountDiscounted = $amountDiscounted * $disc_quantity;
+            } else {
+                $amountDiscounted = $amountDiscounted * $realQty;
             }
 
             if ($amountDiscounted > $item['base_price']) {
diff --git a/packages/Webkul/Discount/src/Actions/FixedAmount.php b/packages/Webkul/Discount/src/Actions/FixedAmount.php
index 140302dcb..a46ae6ecd 100644
--- a/packages/Webkul/Discount/src/Actions/FixedAmount.php
+++ b/packages/Webkul/Discount/src/Actions/FixedAmount.php
@@ -23,6 +23,8 @@ class FixedAmount extends Action
 
             if ($realQty > $disc_quantity) {
                 $amountDiscounted = $amountDiscounted * $disc_quantity;
+            } else {
+                $amountDiscounted = $amountDiscounted * $realQty;
             }
 
             if ($amountDiscounted > $item['base_price']) {
diff --git a/packages/Webkul/Discount/src/Actions/PercentOfProduct.php b/packages/Webkul/Discount/src/Actions/PercentOfProduct.php
index fed6c73c8..542ea349d 100644
--- a/packages/Webkul/Discount/src/Actions/PercentOfProduct.php
+++ b/packages/Webkul/Discount/src/Actions/PercentOfProduct.php
@@ -20,6 +20,8 @@ class PercentOfProduct extends Action
 
             if ($realQty > $disc_quantity) {
                 $amountDiscounted = $amountDiscounted * $disc_quantity;
+            } else {
+                $amountDiscounted = $amountDiscounted * $realQty;
             }
 
             if ($amountDiscounted > $item['base_price']) {