From 0e14f9fdc29d19a9e15cb5380bdeb9b50912a965 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 18 May 2021 14:16:28 +0530
Subject: [PATCH 1/3] Translation Added

---
 packages/Webkul/Shop/src/Resources/lang/ar/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/de/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/en/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/es/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/fa/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/it/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/ja/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/nl/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/pl/app.php    | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 5 ++++-
 packages/Webkul/Shop/src/Resources/lang/tr/app.php    | 5 ++++-
 11 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index cd5de0c80..d67ae47bf 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'احفظ العنوان',
                     'success' => 'العنوان تم تحديثه بنجاح.'
                 ],
+
                 'delete' => [
                     'success' => 'تم حذف العنوان بنجاح.',
                     'failure' => 'لا يمكن حذف العنوان',
                     'wrong-password' => 'كلمة مرور خاطئة !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/de/app.php b/packages/Webkul/Shop/src/Resources/lang/de/app.php
index 67da195d0..19042f924 100755
--- a/packages/Webkul/Shop/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/de/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'Adresse speichern',
                     'success' => 'Adresse erfolgreich aktualisiert.',
                 ],
+
                 'delete' => [
                     'success' => 'Adresse erfolgreich gelöscht',
                     'failure' => 'Adresse kann nicht gelöscht werden',
                     'wrong-password' => 'Falsches Passwort !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 5f5bedc27..aecda5362 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -264,11 +264,14 @@ return [
                     'submit' => 'Save Address',
                     'success' => 'Address updated successfully.',
                 ],
+
                 'delete' => [
                     'success' => 'Address successfully deleted',
                     'failure' => 'Address cannot be deleted',
                     'wrong-password' => 'Wrong Password !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index 3606e810d..e54058b5e 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -263,11 +263,14 @@ return [
                     'submit' => 'Guardar dirección',
                     'success' => 'Dirección actualizada exitosamente.',
                 ],
+
                 'delete' => [
                     'success' => 'Dirección eliminada correctamente',
                     'failure' => 'La dirección no puede ser eliminada',
                     'wrong-password' => 'Contraseña Incorrecta !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index b632a74e8..91b196306 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -260,11 +260,14 @@ return [
                     'submit' => 'ذخیره آدرس',
                     'success' => 'آدرس با موفقیت به روز شد.',
                 ],
+
                 'delete' => [
                     'success' => 'آدرس با موفقیت حذف شد',
                     'failure' => 'آدرس حذف نمی شود',
                     'wrong-password' => 'گذرواژه اشتباه!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index 38d9abfb7..5cf7db485 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -261,11 +261,14 @@ return [
                     'submit' => 'Salva Indirizzo',
                     'success' => 'Indirizzo aggiornato con successo.',
                 ],
+
                 'delete' => [
                     'success' => 'Indirizzo eliminato con successo',
                     'failure' => 'L\'indirizzo non può essere eliminato',
                     'wrong-password' => 'Password errata !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index dea191774..cec4825ab 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -251,11 +251,14 @@ return [
                     'submit' => '保存する',
                     'success' => '住所が更新されました',
                 ],
+
                 'delete' => [
                     'success' => '住所が削除されました',
                     'failure' => '住所の削除に失敗しました。',
                     'wrong-password' => 'パスワードが正しくありません'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index 9d720a252..45d3f4a3d 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -268,11 +268,14 @@ return [
                     'submit' => 'Opslaan',
                     'success' => 'Adres succesvol bijgewerkt..',
                 ],
+
                 'delete' => [
                     'success' => 'Adres succesvol verwijderd.',
                     'failure' => 'Adres kan niet verwijderd worden.',
                     'wrong-password' => 'Verkeerd wachtwoord !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 04a6de4c8..a762d218d 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -261,11 +261,14 @@ return [
                     'submit' => 'Zapisz adres',
                     'success' => 'Adres został zaktualizowany pomyślnie.',
                 ],
+
                 'delete' => [
                     'success' => 'Adres został usunięty pomyślnie.',
                     'failure' => 'Nie można usunąć adresu',
                     'wrong-password' => 'Błędne hasło!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
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 55b91d68a..c5040be7a 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -256,11 +256,14 @@ return [
                     'submit' => 'Salvar Endereço',
                     'success' => 'Endereço Atualizado com sucesso.'
                 ],
+
                 'delete' => [
                     'success' => 'Endereço Excluído com sucesso',
                     'failure' => 'Endereço não pode ser adicionado',
                     'wrong-password' => 'Wrong Password !'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [
diff --git a/packages/Webkul/Shop/src/Resources/lang/tr/app.php b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
index 624e23535..75adf911c 100644
--- a/packages/Webkul/Shop/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/tr/app.php
@@ -260,11 +260,14 @@ return [
                     'submit' => 'Adres Kaydet',
                     'success' => 'Adres Başarıyla Güncellendi.',
                 ],
+
                 'delete' => [
                     'success' => 'Adres başarıyla silindi.',
                     'failure' => 'Adres silinirken hata oluştu!',
                     'wrong-password' => 'Parolanızı hatalı girdiniz!'
-                ]
+                ],
+
+                'default-address' => 'Default Address',
             ],
 
             'order' => [

From 52a6fbabda50e55e8d3e15fe04fa7ea0de30e45e Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 18 May 2021 14:24:35 +0530
Subject: [PATCH 2/3] Velocity Theme Implemented

---
 .../views/shop/customers/account/address/create.blade.php | 8 ++++++++
 .../views/shop/customers/account/address/edit.blade.php   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index f4843b1e4..d7cc138f5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -102,6 +102,14 @@
 
                 {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
 
+                <div class="control-group d-flex">
+                    <input type="checkbox" id="default_address" class="w-auto" name="default_address" {{ old('default_address') ? 'checked' : '' }}>
+
+                    <label class="checkbox-view" for="default_address"></label>
+
+                    {{ __('admin::app.customers.addresses.default-address') }}
+                </div>
+
                 <div class="button-group">
                     <button class="theme-btn" type="submit">
                         {{ __('shop::app.customer.account.address.create.submit') }}
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index e4c168e26..5c5f04df0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -101,6 +101,14 @@
 
             {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
 
+            <div class="control-group d-flex">
+                <input type="checkbox" id="default_address" class="w-auto" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
+
+                <label class="checkbox-view" for="default_address"></label>
+
+                {{ __('admin::app.customers.addresses.default-address') }}
+            </div>
+
             <div class="button-group">
                 <button class="theme-btn" type="submit">
                     {{ __('shop::app.customer.account.address.create.submit') }}

From ec9214c2bb68f7f22e47acbf52e47b15fa08026d Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 18 May 2021 14:34:16 +0530
Subject: [PATCH 3/3] Implemented In Default Theme

---
 .../views/customers/account/address/create.blade.php   | 10 ++++++++++
 .../views/customers/account/address/edit.blade.php     | 10 ++++++++++
 .../shop/customers/account/address/create.blade.php    |  2 +-
 .../shop/customers/account/address/edit.blade.php      |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index f7ecf22ef..7e527c27f 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -105,6 +105,16 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.after') !!}
 
+                    <div class="control-group">
+                        <span class="checkbox">
+                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ old('default_address') ? 'checked' : '' }} >
+
+                            <label class="checkbox-view" for="default_address"></label>
+
+                            {{ __('shop::app.customer.account.address.default-address') }}
+                        </span>
+                    </div>
+
                     <div class="button-group">
                         <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.account.address.create.submit') }}">
                         {{-- <button class="btn btn-primary btn-lg" type="submit">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index aa7bcbd34..40425b9f0 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -108,6 +108,16 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
 
+                    <div class="control-group">
+                        <span class="checkbox">
+                            <input type="checkbox" class="control" id="default_address" name="default_address" {{ $address->default_address ? 'checked' : '' }} >
+
+                            <label class="checkbox-view" for="default_address"></label>
+
+                            {{ __('shop::app.customer.account.address.default-address') }}
+                        </span>
+                    </div>
+
                     <div class="button-group">
                         <button class="btn btn-primary btn-lg" type="submit">
                             {{ __('shop::app.customer.account.address.create.submit') }}
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index d7cc138f5..cd0273003 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -107,7 +107,7 @@
 
                     <label class="checkbox-view" for="default_address"></label>
 
-                    {{ __('admin::app.customers.addresses.default-address') }}
+                    {{ __('shop::app.customer.account.address.default-address') }}
                 </div>
 
                 <div class="button-group">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index 5c5f04df0..225ea3cb4 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -106,7 +106,7 @@
 
                 <label class="checkbox-view" for="default_address"></label>
 
-                {{ __('admin::app.customers.addresses.default-address') }}
+                {{ __('shop::app.customer.account.address.default-address') }}
             </div>
 
             <div class="button-group">