From bea41e9e42354be0f53c36cef1ee473c5777e7d1 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Thu, 26 Nov 2020 13:55:22 +0530
Subject: [PATCH 1/3] optimization code

---
 .../Product/src/Repositories/ProductFlatRepository.php    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
index dc9027d3d..4f1bd776d 100644
--- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
@@ -102,11 +102,9 @@ class ProductFlatRepository extends Repository
 
         foreach ($products as $key => $product) {
             foreach ($filterAttributes as $attribute) {
-                if ($attribute->code <> 'price') {
-                    if (isset($product[$attribute->code])) {
-                        if (! in_array($product[$attribute->code], $allProductAttributeOptionsCode)) {
-                            array_push($allProductAttributeOptionsCode, $product[$attribute->code]);
-                        }
+                if ($attribute->code <> 'price' && isset($product[$attribute->code])) {
+                    if (! in_array($product[$attribute->code], $allProductAttributeOptionsCode)) {
+                        array_push($allProductAttributeOptionsCode, $product[$attribute->code]);
                     }
                 }
             }

From 35c3b119ccfdc1716a338595936544b61e1727e1 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Mon, 30 Nov 2020 11:50:11 +0530
Subject: [PATCH 2/3] #4321 fixed

---
 .../src/Resources/views/shop/products/buy-now.blade.php    | 7 +++++++
 .../src/Resources/views/shop/products/view.blade.php       | 4 ++++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/products/buy-now.blade.php

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/buy-now.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/buy-now.blade.php
new file mode 100644
index 000000000..8bc1844b8
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/buy-now.blade.php
@@ -0,0 +1,7 @@
+{!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!}
+
+<button type="submit" class="theme-btn text-center buynow" {{ ! $product->isSaleable(1) ? 'disabled' : '' }}>
+    {{ __('shop::app.products.buy-now') }}
+</button>
+
+{!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
index 3937054fd..e5c9276dd 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
@@ -124,6 +124,10 @@
                                         </div>
 
                                         <div class="product-actions">
+                                            @include ('shop::products.buy-now', [
+                                                'product' => $product,
+                                            ])
+
                                             @include ('shop::products.add-to-cart', [
                                                 'form' => false,
                                                 'product' => $product,

From 20a737825806636669f6c5691b31d2e075927406 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Mon, 30 Nov 2020 12:52:57 +0530
Subject: [PATCH 3/3] added configuration in buy now button display

---
 packages/Webkul/Admin/src/Config/system.php               | 4 ++++
 packages/Webkul/Admin/src/Resources/lang/ar/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/de/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/en/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/es/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/fa/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/it/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/nl/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/pl/app.php       | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php    | 3 ++-
 packages/Webkul/Admin/src/Resources/lang/tr/app.php       | 3 ++-
 .../Resources/views/products/view/product-add.blade.php   | 4 +++-
 .../src/Resources/views/shop/products/view.blade.php      | 8 +++++---
 13 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index 2ad1d0c05..e1e5bce54 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -218,6 +218,10 @@ return [
                     ],
                 ],
                 'channel_based' => true,
+            ], [
+                'name'  => 'buy_now_button_display',
+                'title' => 'admin::app.admin.system.buy-now-button-display',
+                'type'  => 'boolean',
             ]
         ],
     ], [
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 44e75691a..2f9acd788 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1379,7 +1379,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index 23de5cd88..14c613b9d 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -1353,7 +1353,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ],
     ],
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 9d8f93c0e..ef8a87b85 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1379,7 +1379,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index f47b6be78..4b513c147 100644
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1335,7 +1335,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index c83b77288..0e3597066 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1371,7 +1371,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index c5e7a5a08..40f7a214c 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -1376,7 +1376,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 7a2db4c95..0739f4c37 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -1371,7 +1371,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index f74fb2b97..104062d1a 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -1360,7 +1360,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
        ]
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index f4420f2ff..e2384ffb8 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1374,7 +1374,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 1ef7d0e9f..b7dcc0f40 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1357,7 +1357,8 @@ return [
             'client-secret' => 'Client Secret',
             'client-secret-info' => 'Add your secret key here',
             'accepted-currencies' => 'Accepted currencies',
-            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...'
+            'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
+            'buy-now-button-display' => 'Buy now button display'
         ]
     ]
 ];
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php
index ba4e3a25f..cb621c137 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php
@@ -3,7 +3,9 @@
 <div class="add-to-buttons">
     @include ('shop::products.add-to-cart', ['product' => $product])
 
-    @include ('shop::products.buy-now')
+    @if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
+        @include ('shop::products.buy-now')                                      
+    @endif
 </div>
 
 {!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
index e5c9276dd..b9fe70ce5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
@@ -124,9 +124,11 @@
                                         </div>
 
                                         <div class="product-actions">
-                                            @include ('shop::products.buy-now', [
-                                                'product' => $product,
-                                            ])
+                                            @if (core()->getConfigData('catalog.products.storefront.buy_now_button_display'))
+                                                @include ('shop::products.buy-now', [
+                                                    'product' => $product,
+                                                ])
+                                            @endif
 
                                             @include ('shop::products.add-to-cart', [
                                                 'form' => false,