From bfd67a573c5a311f385a43fae68ed2211e69653c Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Thu, 17 Jun 2021 20:50:24 +0200
Subject: [PATCH 1/6] Auto publish assets

---
 packages/Webkul/Core/src/Console/Commands/Install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Core/src/Console/Commands/Install.php b/packages/Webkul/Core/src/Console/Commands/Install.php
index ba6bd9ac9..fb6f86bc0 100644
--- a/packages/Webkul/Core/src/Console/Commands/Install.php
+++ b/packages/Webkul/Core/src/Console/Commands/Install.php
@@ -55,7 +55,7 @@ class Install extends Command
 
         // running `php artisan vendor:publish --all`
         $this->warn('Step: Publishing assets and configurations...');
-        $result = $this->call('vendor:publish', ['--all']);
+        $result = $this->call('vendor:publish', ['--all' => true, '--force' => true]);
         $this->info($result);
 
         // running `php artisan storage:link`

From 6446d092e3529d267d4b405350a0bbd5d9ef448f Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Thu, 17 Jun 2021 20:51:07 +0200
Subject: [PATCH 2/6] Updated version number

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 11d047a3c..2c14ddb1e 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
 APP_NAME=Bagisto
 APP_ENV=local
-APP_VERSION=1.3.1
+APP_VERSION=1.3.2
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost

From e111da15daa2977a2c646e5d51177ce8b1d1f232 Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Thu, 17 Jun 2021 20:51:30 +0200
Subject: [PATCH 3/6] Updated version number

---
 .env.testing | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.testing b/.env.testing
index 7bdd59aac..08f92491f 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_VERSION=1.3.1
+APP_VERSION=1.3.2
 APP_KEY=base64:G4KY3tUsTaY9ONo1n/QyJvVLQZdJDgbIkSJswFK01HE=
 APP_DEBUG=true
 APP_URL=http://localhost
@@ -43,4 +43,4 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 SHOP_MAIL_FROM=test@example.com
-ADMIN_MAIL_TO=test@example.com
\ No newline at end of file
+ADMIN_MAIL_TO=test@example.com

From 7b3c53c9e7677a345a7a12c809ad1131cd071c46 Mon Sep 17 00:00:00 2001
From: Glenn Hermans <glhermans@gmail.com>
Date: Fri, 18 Jun 2021 17:20:26 +0200
Subject: [PATCH 4/6] fixed #4941

---
 .../views/admin/meta-info/meta-data.blade.php     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 7a07ab86f..da863f528 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -69,7 +69,10 @@
             <accordian :title="'{{ __('velocity::app.admin.meta-data.general') }}'" :active="true">
                 <div slot="body">
                     <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.activate-slider') }}</label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.activate-slider') }}
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
+                        </label>
 
                         <label class="switch">
                             <input
@@ -85,7 +88,10 @@
                     </div>
 
                     <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.sidebar-categories') }}</label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.sidebar-categories') }}
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
+                        </label>
 
                         <input
                             type="number"
@@ -97,7 +103,10 @@
                     </div>
 
                     <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.header_content_count') }}</label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.header_content_count') }}
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
+                        </label>
 
                         <input
                             type="number"

From 442c763308b33915ff8bdde4266bccac77653f6b Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 21 Jun 2021 11:44:01 +0530
Subject: [PATCH 5/6] Added Requested Customer ID

---
 .../DataGrids/CustomersInvoicesDataGrid.php   | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/CustomersInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomersInvoicesDataGrid.php
index 9c6a8fa48..323c870f6 100644
--- a/packages/Webkul/Admin/src/DataGrids/CustomersInvoicesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomersInvoicesDataGrid.php
@@ -10,15 +10,31 @@ class CustomersInvoicesDataGrid extends DataGrid
 {
     use ProvideDataGridPlus;
 
+    /**
+     * Index column.
+     *
+     * @var int
+     */
     protected $index = 'id';
 
+    /**
+     * Default sort order of datagrid.
+     *
+     * @var string
+     */
     protected $sortOrder = 'desc';
 
+    /**
+     * Prepare query.
+     *
+     * @return void
+     */
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('invoices')
             ->leftJoin('orders as ors', 'invoices.order_id', '=', 'ors.id')
-            ->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at');
+            ->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at')
+            ->where('ors.customer_id', request('id'));
 
         $this->addFilter('id', 'invoices.id');
         $this->addFilter('order_id', 'ors.increment_id');
@@ -28,6 +44,11 @@ class CustomersInvoicesDataGrid extends DataGrid
         $this->setQueryBuilder($queryBuilder);
     }
 
+    /**
+     * Add columns.
+     *
+     * @return void
+     */
     public function addColumns()
     {
         $this->addColumn([
@@ -66,7 +87,7 @@ class CustomersInvoicesDataGrid extends DataGrid
             'closure'    => true,
             'filterable' => true,
             'wrapper'    => function ($value) {
-                return '<a href="'. route('admin.sales.orders.view', $value->order_id). '">' . $value->order_id . '</a>';
+                return '<a href="' . route('admin.sales.orders.view', $value->order_id) . '">' . $value->order_id . '</a>';
             }
         ]);
 
@@ -101,6 +122,11 @@ class CustomersInvoicesDataGrid extends DataGrid
         ]);
     }
 
+    /**
+     * Prepare actions.
+     *
+     * @return void
+     */
     public function prepareActions()
     {
         $this->addAction([
@@ -110,4 +136,4 @@ class CustomersInvoicesDataGrid extends DataGrid
             'icon'   => 'icon eye-icon',
         ]);
     }
-}
\ No newline at end of file
+}

From d83597412dd47b1e203c6b3e56a478d0f772ac24 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 21 Jun 2021 12:18:12 +0530
Subject: [PATCH 6/6] Some Translation Added

---
 packages/Webkul/Admin/src/Resources/lang/ar/app.php    | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/de/app.php    | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/fa/app.php    | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/it/app.php    | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/pl/app.php    | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php | 4 ++--
 packages/Webkul/Admin/src/Resources/lang/tr/app.php    | 4 ++--
 packages/Webkul/Shop/src/Resources/lang/ar/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/de/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/es/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/fa/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/it/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/ja/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/nl/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/pl/app.php     | 2 +-
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php  | 2 +-
 16 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index d53031e43..3f5c4ecc0 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1433,8 +1433,8 @@ return [
             'order-number-length' => 'طول رقم الطلب',
             'order-number-suffix' => 'لاحقة رقم الطلب',
             'order-number-generator-class' => 'مولد رقم الطلب',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'الحد الأدنى من إعدادات الطلب',
+            'minimum-order-amount' => 'الحد الأدنى للطلب',
             'default' => 'إفتراضي',
             'sandbox' => 'صندوق الرمل',
             'all-channels' => 'الكل',
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index c9c50d950..8d766c294 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -1441,8 +1441,8 @@ return [
             'order-number-length'          => 'Auftragsnummer Länge',
             'order-number-suffix'          => 'Auftragsnummer Suffix',
             'order-number-generator-class' => 'Bestell nummern generator',
-            'minimum-order'                => 'Minimum Order Settings',
-            'minimum-order-amount'         => 'Minimum Order Amount',
+            'minimum-order'                => 'Einstellungen für die Mindestbestellmenge',
+            'minimum-order-amount'         => 'Mindestbestellmenge',
             'default'                      => 'Standard',
             'sandbox'                      => 'Sandbox',
             'all-channels'                 => 'Alle',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index d676cb226..f9974f42c 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1425,8 +1425,8 @@ return [
             'order-number-length' => 'طول شماره سفارش',
             'order-number-suffix' => 'تعداد کافی شماره سفارش',
             'order-number-generator-class' => 'تولید کننده شماره سفارش',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'حداقل تنظیمات سفارش',
+            'minimum-order-amount' => 'حداقل مقدار سفارش',
             'default' => 'پیش فرض',
             'sandbox' => 'Sandbox',
             'all-channels' => 'همه',
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index 6257de629..e63f57e52 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -1433,8 +1433,8 @@ return [
             'order-number-length' => 'Lunghezza Numero Ordine',
             'order-number-suffix' => 'Suffisso Numero Ordine',
             'order-number-generator-class' => 'Generatore di numeri dordine',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'Impostazioni dell\'ordine minimo',
+            'minimum-order-amount' => 'Importo minimo dell\'ordine',
             'default' => 'Default',
             'sandbox' => 'Sandbox',
             'all-channels' => 'Tutti',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index 153bf5664..7e1c65fcd 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -1430,8 +1430,8 @@ return [
             'order-number-length' => 'Długość numeru zamówienia',
             'order-number-suffix' => 'Sufiks numeru zamówienia”',
             'order-number-generator-class' => 'Generator numeru zamówienia',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'Minimalne ustawienia zamówienia',
+            'minimum-order-amount' => 'Minimalna kwota zamówienia',
             'default' => 'Domyślna',
             'sandbox' => 'Piaskownica',
             'all-channels' => 'Wszystkie kanały',
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 8d865421e..cf43051db 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1431,8 +1431,8 @@ return [
             'order-number-length' => 'Tamanho do Número do Pedido',
             'order-number-suffix' => 'Sufixo do Número de Pedido',
             'order-number-generator-class' => 'Gerador de número de pedido',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'Configurações de pedido mínimo ',
+            'minimum-order-amount' => 'Quantidade Mínima do Pedido',
             'default' => 'Padrão',
             'sandbox' => 'Sandbox',
             'all-channels' => 'Todos',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 0baf071d1..69bb496d8 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1417,8 +1417,8 @@ return [
             'order-number-length' => 'Numara Uzunluğu',
             'order-number-suffix' => 'Numara Son Eki',
             'order-number-generator-class' => 'Sipariş Numarası Üreticisi',
-            'minimum-order' => 'Minimum Order Settings',
-            'minimum-order-amount' => 'Minimum Order Amount',
+            'minimum-order' => 'Minimum Sipariş Ayarları',
+            'minimum-order-amount' => 'Minimum Sipariş Tutarı',
             'default' => 'Varsayılan',
             'sandbox' => 'Havuz',
             'all-channels' => 'Tümü',
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index c1714b477..a6824e2bb 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -504,7 +504,7 @@ return [
             'event' => [
                 'expired' => 'This event has been expired.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'الحد الأدنى لمبلغ الطلب هو :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index 19042f924..146a152ab 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -497,7 +497,7 @@ return [
             'cart-remove-action' => 'Wollen Sie dies wirklich tun?',
             'partial-cart-update' => 'Nur einige der Produkte wurden aktualisiert',
             'link-missing' => '',
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'Mindestbestellmenge ist :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 8f7022e49..ca34910ab 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -503,7 +503,7 @@ return [
             'event' => [
                 'expired' => 'This event has been expired.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'La cantidad mínima de pedido es :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index b89dc29e3..2bdef7fce 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -500,7 +500,7 @@ return [
             'event' => [
                 'expired' => 'This event has been expired.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'حداقل مقدار سفارش است :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 6b0601409..06738cd55 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -501,7 +501,7 @@ return [
             'event' => [
                 'expired' => 'Questo evento è terminato.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'L\'importo minimo dell\'ordine è :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 0013a8b79..003cb5aa6 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -462,7 +462,7 @@ return [
             'cart-remove-action' => '手続きを進めますか。',
             'partial-cart-update' => 'Only some of the product(s) were updated',
             'link-missing' => '',
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => '最小注文額は :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index d2e98a659..a79545f29 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -508,7 +508,7 @@ return [
             'event' => [
                 'expired' => 'This event has been expired.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'Minimum orderbedrag is :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index c384f581d..3961f5f29 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -500,7 +500,7 @@ return [
             'event' => [
                 'expired' => 'To wydarzenie wygasło.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'Minimalna kwota zamówienia to :amount'
         ],
 
         'onepage' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 962742806..bdf4c69ee 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -493,7 +493,7 @@ return [
             'event' => [
                 'expired' => 'This event has been expired.'
             ],
-            'minimum-order-message' => 'Minimum order amount is :amount'
+            'minimum-order-message' => 'O valor mínimo do pedido é :amount'
         ],
 
         'onepage' => [