From 2eb8aa972c6a2d151c690a4028c03d04f3f49b70 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Thu, 16 Apr 2020 18:16:40 +0530
Subject: [PATCH 1/3] Issue #2895

---
 .../src/Http/Controllers/Customer/CustomerGroupController.php   | 2 ++
 .../Resources/views/customers/addresses/orders/index.blade.php  | 2 +-
 .../src/Http/Controllers/InventorySourceController.php          | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
index 45adba153..1ef616050 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
@@ -105,6 +105,8 @@ class CustomerGroupController extends Controller
             'name' => 'required',
         ]);
 
+        dd(request()->all());
+
         $this->customerGroupRepository->update(request()->all(), $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group']));
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
index fae339a03..efb412d25 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/orders/index.blade.php
@@ -1,4 +1,4 @@
-@extends('address::admin.layouts.content')
+@extends('admin::layouts.content')
 
 @section('page_title')
     {{ __('address::app.admin.addresses.title-orders', ['customer_name' => $customer->first_name . ' ' . $customer->last_name]) }}
diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
index 3b8c9917a..56b9514d7 100755
--- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
+++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
@@ -125,6 +125,8 @@ class InventorySourceController extends Controller
 
         $data = request()->all();
 
+        dd($data);
+
         $data['status'] = !isset($data['status']) ? 0 : 1;
 
         Event::dispatch('inventory.inventory_source.update.before', $id);

From bcb32f3121a40a75bd768b5cb3e128d14a18366d Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Thu, 16 Apr 2020 18:19:56 +0530
Subject: [PATCH 2/3] removed dd

---
 .../src/Http/Controllers/Customer/CustomerGroupController.php   | 2 --
 .../src/Http/Controllers/InventorySourceController.php          | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
index 1ef616050..45adba153 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
@@ -105,8 +105,6 @@ class CustomerGroupController extends Controller
             'name' => 'required',
         ]);
 
-        dd(request()->all());
-
         $this->customerGroupRepository->update(request()->all(), $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group']));
diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
index 56b9514d7..3b8c9917a 100755
--- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
+++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
@@ -125,8 +125,6 @@ class InventorySourceController extends Controller
 
         $data = request()->all();
 
-        dd($data);
-
         $data['status'] = !isset($data['status']) ? 0 : 1;
 
         Event::dispatch('inventory.inventory_source.update.before', $id);

From 3412da366f289a41725a57d548ffd8d375c1e4a1 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Thu, 16 Apr 2020 19:18:01 +0530
Subject: [PATCH 3/3] Issue #2893

---
 packages/Webkul/Admin/src/Resources/lang/ar/app.php         | 1 +
 packages/Webkul/Admin/src/Resources/lang/en/app.php         | 1 +
 packages/Webkul/Admin/src/Resources/lang/fa/app.php         | 1 +
 packages/Webkul/Admin/src/Resources/lang/nl/app.php         | 1 +
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php      | 1 +
 .../src/Resources/views/sales/shipments/create.blade.php    | 6 ++++--
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 1f95df145..61969ca19 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -409,6 +409,7 @@ return [
             'add-title' => 'أنشئ شحنة',
             'save-btn-title' => 'احفظ الشحنة',
             'qty-ordered' => 'أمر qty',
+            'qty-invoiced' => 'Qty Invoiced',
             'qty-to-ship' => 'من كيوتي إلى السفينة',
             'available-sources' => 'المصادر المتاحة',
             'source' => 'المصدر',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 7cbeee2e2..e04395bab 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -409,6 +409,7 @@ return [
             'add-title' => 'Create Shipment',
             'save-btn-title' => 'Save Shipment',
             'qty-ordered' => 'Qty Ordered',
+            'qty-invoiced' => 'Qty Invoiced',
             'qty-to-ship' => 'Qty to Ship',
             'available-sources' => 'Available Sources',
             'source' => 'Source',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 4aff942c4..ea4c62a9b 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -409,6 +409,7 @@ return [
             'add-title' => 'ایجاد حمل و نقل',
             'save-btn-title' => 'ذخیره حمل و نقل',
             'qty-ordered' => 'سفارش داده شده',
+            'qty-invoiced' => 'Qty Invoiced',
             'qty-to-ship' => 'مقدار به کشتی',
             'available-sources' => 'منابع موجود',
             'source' => 'منابع',
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index b263d1487..18a75ccd5 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -409,6 +409,7 @@ return [
             'add-title' => 'Zending maken',
             'save-btn-title' => 'Zending opslaan',
             'qty-ordered' => 'Besteld aantal',
+            'qty-invoiced' => 'Qty Invoiced',
             'qty-to-ship' => 'Te verzenden',
             'available-sources' => 'Beschikbare bronnen',
             'source' => 'Bron',
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 71aed9a09..23d6bd830 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -409,6 +409,7 @@ return [
             'add-title' => 'Criar Entrega',
             'save-btn-title' => 'Salvar Entrega',
             'qty-ordered' => 'Qtd pedido',
+            'qty-invoiced' => 'Qty Invoiced',
             'qty-to-ship' => 'Qty para enviar',
             'available-sources' => 'Fontes Disponíveis',
             'source' => 'Fonte',
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
index 9380ad3f6..157a9e33e 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@@ -263,6 +263,7 @@
                         <th>{{ __('admin::app.sales.orders.SKU') }}</th>
                         <th>{{ __('admin::app.sales.orders.product-name') }}</th>
                         <th>{{ __('admin::app.sales.shipments.qty-ordered') }}</th>
+                        <th>{{ __('admin::app.sales.shipments.qty-invoiced') }}</th>
                         <th>{{ __('admin::app.sales.shipments.qty-to-ship') }}</th>
                         <th>{{ __('admin::app.sales.shipments.available-sources') }}</th>
                     </tr>
@@ -288,6 +289,7 @@
                                     @endif
                                 </td>
                                 <td>{{ $item->qty_ordered }}</td>
+                                <td>{{ $item->qty_invoiced }}</td>
                                 <td>{{ $item->qty_to_ship }}</td>
                                 <td>
 
@@ -324,8 +326,8 @@
 
                                                         <div class="control-group" :class="[errors.has('{{ $inputName }}') ? 'has-error' : '']">
 
-                                                            <input type="text" v-validate="'required|numeric|min_value:0|max_value:{{$sourceQty}}'" class="control" id="{{ $inputName }}" name="{{ $inputName }}" value="0" data-vv-as="&quot;{{ __('admin::app.sales.shipments.qty-to-ship') }}&quot;" :disabled="source != '{{ $inventorySource->id }}'"/>
-
+                                                            <input type="text" v-validate="'required|numeric|min_value:0|max_value:{{$sourceQty}}'" class="control" id="{{ $inputName }}" name="{{ $inputName }}" value="{{ $item->qty_invoiced }}" data-vv-as="&quot;{{ __('admin::app.sales.shipments.qty-to-ship') }}&quot;" :disabled="source != '{{ $inventorySource->id }}'"/>
+                                                            
                                                             <span class="control-error" v-if="errors.has('{{ $inputName }}')">
                                                                 @verbatim
                                                                     {{ errors.first('<?php echo $inputName; ?>') }}