resolved conflicts.

bagisto · Mar 13, 2024 · 4e1c928 · 4e1c928
2 parents c69d36a + 010c7b5
commit 4e1c928
Show file tree

Hide file tree

Showing 138 changed files with 4,111 additions and 5,802 deletions.
diff --git a/CHANGELOG_v2.x.x.md b/CHANGELOG_v2.x.x.md
@@ -2,6 +2,27 @@
 
 This changelog consists of the bug & security fixes and new features being included in the releases listed below.
 
+## **v2.1.2 (8th of March 2024)** - *Release*
+* #9547 [improvements] - Revamped completed checkout flow.
+
+* #9537 [fixed] - Unable to Checkout Product when Address is created from user profile and then proceed for checkout. Email is a mandatory field at checkout.
+
+* #9544 [fixed] - 500 Internal Server error in console as Transaction Datagrid Not working.
+
+* #9551 [fixed] - Admin End -> Sales -> Transactions Datagrid is having status row status entries UI is not appropriate and also translations is missing for Payment Method.
+
+* #9550 [fixed] - Downloadable Product Datagrid in customer profile -> Status Row is having missing status entries.
+
+* #9564 [fixed] - Date Filters not working in Transaction section in Admin End.
+
+* #9568 [fixed] - In Customer Profile Reviews -> there we are able to see only 5 reviews in total, but I have approved more reviews for the same user. 
+
+* #9567 [fixed] - After applying a filter on the orders page , Sidebar Scroller should be working - Customer end.
+
+* #9579 [fixed] - Fix issue related to moving items between the wishlist and cart with quantities.
+
+* #9543 [fixed] - Once the user has requested for password reset, then again if user raises the request there validation message appears "We cannot find a user with that email address."
+
 ## **v2.1.1 (27th of February 2024)** - *Release*
 
 * #9501 [fixed] - Can't Checkout

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
@@ -966,7 +966,7 @@
                 'channel_based' => true,
                 'locale_based'  => false,
             ], [
-                'name'          => 'address1',
+                'name'          => 'address',
                 'title'         => 'admin::app.configuration.index.sales.shipping.origin.street-address',
                 'type'          => 'text',
                 'validation'    => 'required',

diff --git a/packages/Webkul/Admin/src/DataGrids/Customers/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Customers/AddressDataGrid.php
@@ -40,7 +40,7 @@ public function prepareQueryBuilder()
             ->addSelect(
                 'ca.id as address_id',
                 'ca.company_name',
-                'ca.address1',
+                'ca.address',
                 'ca.country',
                 DB::raw(''.DB::getTablePrefix().'countries.name as country_name'),
                 'ca.state',
@@ -61,7 +61,7 @@ public function prepareQueryBuilder()
             ->addSelect(DB::raw(DB::getTablePrefix().'country_states.default_name as state_name'));
 
         $this->addFilter('company_name', 'ca.company_name');
-        $this->addFilter('address1', 'ca.address1');
+        $this->addFilter('address', 'ca.address');
         $this->addFilter('postcode', 'ca.postcode');
         $this->addFilter('city', 'ca.city');
         // $this->addFilter('state_name', DB::raw(DB::getTablePrefix() . 'country_states.default_name'));
@@ -97,7 +97,7 @@ public function prepareColumns()
         ]);
 
         $this->addColumn([
-            'index'      => 'address1',
+            'index'      => 'address',
             'label'      => trans('admin::app.customers.addresses.address-1'),
             'type'       => 'string',
             'searchable' => true,

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customers/AddressController.php b/packages/Webkul/Admin/src/Http/Controllers/Customers/AddressController.php
@@ -55,7 +55,7 @@ public function store(): JsonResponse
     {
         $this->validate(request(), [
             'company_name' => [new AlphaNumericSpace],
-            'address1'     => ['required', 'array'],
+            'address'      => ['required', 'array'],
             'country'      => ['required', new AlphaNumericSpace],
             'state'        => ['required', new AlphaNumericSpace],
             'city'         => ['required', 'string'],
@@ -71,7 +71,7 @@ public function store(): JsonResponse
             'vat_id',
             'first_name',
             'last_name',
-            'address1',
+            'address',
             'city',
             'country',
             'state',
@@ -80,8 +80,7 @@ public function store(): JsonResponse
             'email',
             'default_address',
         ]), [
-            'address1' => implode(PHP_EOL, array_filter(request()->input('address1'))),
-            'address2' => implode(PHP_EOL, array_filter(request()->input('address2', []))),
+            'address' => implode(PHP_EOL, array_filter(request()->input('address'))),
         ]);
 
         Event::dispatch('customer.addresses.create.before');
@@ -114,7 +113,7 @@ public function update(int $id): JsonResponse
     {
         $this->validate(request(), [
             'company_name' => [new AlphaNumericSpace],
-            'address1'     => ['required', 'array'],
+            'address'      => ['required', 'array'],
             'country'      => ['required', new AlphaNumericSpace],
             'state'        => ['required', new AlphaNumericSpace],
             'city'         => ['required', 'string'],
@@ -130,7 +129,7 @@ public function update(int $id): JsonResponse
             'vat_id',
             'first_name',
             'last_name',
-            'address1',
+            'address',
             'city',
             'country',
             'state',
@@ -139,8 +138,7 @@ public function update(int $id): JsonResponse
             'email',
             'default_address',
         ]), [
-            'address1' => implode(PHP_EOL, array_filter(request()->input('address1'))),
-            'address2' => implode(PHP_EOL, array_filter(request()->input('address2', []))),
+            'address' => implode(PHP_EOL, array_filter(request()->input('address'))),
         ]);
 
         Event::dispatch('customer.addresses.update.before', $id);

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customers/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customers/CustomerController.php
@@ -237,7 +237,7 @@ public function search()
     {
         $customers = $this->customerRepository->scopeQuery(function ($query) {
             return $query->where('email', 'like', '%'.urldecode(request()->input('query')).'%')
-                ->orWhere(DB::raw('CONCAT('.DB::getTablePrefix().'first_name, " ", '.DB::getTablePrefix().'last_name)'), 'like', '%'.urldecode(request()->input('query')).'%')
+                ->orWhere(DB::raw('CONCAT(first_name, " ", last_name)'), 'like', '%'.urldecode(request()->input('query')).'%')
                 ->orderBy('created_at', 'desc');
         })->paginate(self::COUNT);
 

diff --git a/packages/Webkul/Admin/src/Resources/assets/js/plugins/vee-validate.js b/packages/Webkul/Admin/src/Resources/assets/js/plugins/vee-validate.js
@@ -65,6 +65,22 @@ export default {
             return true;
         });
 
+        defineRule("address", (value) => {
+            if (!value || !value.length) {
+                return true;
+            }
+
+            if (
+                !/^[a-zA-Z0-9\s.\/*'\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\u0590-\u05FF\u3040-\u309F\u30A0-\u30FF\u0400-\u04FF\u0D80-\u0DFF\u3400-\u4DBF\u2000-\u2A6D\u00C0-\u017F\u0980-\u09FF\u0900-\u097F\u4E00-\u9FFF,\(\)-]{1,60}$/iu.test(
+                    value
+                )
+            ) {
+                return false;
+            }
+
+            return true;
+        });
+
         defineRule("decimal", (value, { decimals = '*', separator = '.' } = {}) => {
             if (value === null || value === undefined || value === '') {
                 return true;

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1307,6 +1307,53 @@
                 'suspended'                   => 'معلق',
                 'title'                       => 'عرض العميل',
                 'total-revenue'               => 'إجمالي الإيرادات - :revenue',
+
+                'addresses' => [
+                    'create' => [
+                        'address-1'          => 'العنوان 1',
+                        'address-2'          => 'العنوان 2',
+                        'city'               => 'المدينة',
+                        'company-name'       => 'اسم الشركة',
+                        'country'            => 'الدولة',
+                        'create-address-btn' => 'إضافة عنوان جديد',
+                        'default-address'    => 'العنوان الافتراضي',
+                        'email'              => 'البريد الإلكتروني',
+                        'first-name'         => 'الاسم الأول',
+                        'last-name'          => 'اسم العائلة',
+                        'phone'              => 'الهاتف',
+                        'post-code'          => 'الرمز البريدي',
+                        'save-btn-title'     => 'حفظ العنوان',
+                        'select-country'     => 'اختر الدولة',
+                        'state'              => 'الولاية',
+                        'street-address'     => 'عنوان الشارع',
+                        'title'              => 'إنشاء عنوان العميل',
+                        'vat-id'             => 'الرقم الضريبي (VAT ID)',
+                    ],
+
+                    'edit' => [
+                        'address-1'       => 'العنوان 1',
+                        'address-2'       => 'العنوان 2',
+                        'city'            => 'المدينة',
+                        'company-name'    => 'اسم الشركة',
+                        'country'         => 'الدولة',
+                        'default-address' => 'العنوان الافتراضي',
+                        'email'           => 'البريد الإلكتروني',
+                        'first-name'      => 'الاسم الأول',
+                        'last-name'       => 'اسم العائلة',
+                        'phone'           => 'الهاتف',
+                        'post-code'       => 'الرمز البريدي',
+                        'save-btn-title'  => 'حفظ العنوان',
+                        'select-country'  => 'اختر الدولة',
+                        'state'           => 'الولاية',
+                        'street-address'  => 'عنوان الشارع',
+                        'title'           => 'تعديل العنوان',
+                        'vat-id'          => 'الرقم الضريبي (VAT ID)',
+                    ],
+
+                    'create-success'      => 'تم إنشاء العنوان بنجاح',
+                    'success-mass-delete' => 'حذف العناوين بنجاح',
+                    'update-success'      => 'تم تحديث العنوان بنجاح',
+                ],
             ],
         ],
 
@@ -1393,53 +1440,6 @@
                 ],
             ],
         ],
-
-        'addresses' => [
-            'create' => [
-                'address-1'          => 'العنوان 1',
-                'address-2'          => 'العنوان 2',
-                'city'               => 'المدينة',
-                'company-name'       => 'اسم الشركة',
-                'country'            => 'الدولة',
-                'create-address-btn' => 'إضافة عنوان جديد',
-                'default-address'    => 'العنوان الافتراضي',
-                'email'              => 'البريد الإلكتروني',
-                'first-name'         => 'الاسم الأول',
-                'last-name'          => 'اسم العائلة',
-                'phone'              => 'الهاتف',
-                'post-code'          => 'الرمز البريدي',
-                'save-btn-title'     => 'حفظ العنوان',
-                'select-country'     => 'اختر الدولة',
-                'state'              => 'الولاية',
-                'street-address'     => 'عنوان الشارع',
-                'title'              => 'إنشاء عنوان العميل',
-                'vat-id'             => 'الرقم الضريبي (VAT ID)',
-            ],
-
-            'edit' => [
-                'address-1'       => 'العنوان 1',
-                'address-2'       => 'العنوان 2',
-                'city'            => 'المدينة',
-                'company-name'    => 'اسم الشركة',
-                'country'         => 'الدولة',
-                'default-address' => 'العنوان الافتراضي',
-                'email'           => 'البريد الإلكتروني',
-                'first-name'      => 'الاسم الأول',
-                'last-name'       => 'اسم العائلة',
-                'phone'           => 'الهاتف',
-                'post-code'       => 'الرمز البريدي',
-                'save-btn-title'  => 'حفظ العنوان',
-                'select-country'  => 'اختر الدولة',
-                'state'           => 'الولاية',
-                'street-address'  => 'عنوان الشارع',
-                'title'           => 'تعديل العنوان',
-                'vat-id'          => 'الرقم الضريبي (VAT ID)',
-            ],
-
-            'create-success'      => 'تم إنشاء العنوان بنجاح',
-            'success-mass-delete' => 'حذف العناوين بنجاح',
-            'update-success'      => 'تم تحديث العنوان بنجاح',
-        ],
     ],
 
     'marketing' => [

diff --git a/packages/Webkul/Admin/src/Resources/lang/bn/app.php b/packages/Webkul/Admin/src/Resources/lang/bn/app.php
@@ -1307,6 +1307,53 @@
                 'suspended'                   => 'স্থগিত',
                 'title'                       => 'গ্রাহক দৃশ্য',
                 'total-revenue'               => 'মোট আয় - :revenue',
+
+                'addresses' => [
+                    'create' => [
+                        'address-1'          => 'ঠিকানা 1',
+                        'address-2'          => 'ঠিকানা 2',
+                        'city'               => 'শহর',
+                        'company-name'       => 'কোম্পানির নাম',
+                        'country'            => 'দেশ',
+                        'create-address-btn' => 'নতুন ঠিকানা যুক্ত করুন',
+                        'default-address'    => 'ডিফল্ট ঠিকানা',
+                        'email'              => 'ইমেল',
+                        'first-name'         => 'প্রথম নাম',
+                        'last-name'          => 'শেষ নাম',
+                        'phone'              => 'ফোন',
+                        'post-code'          => 'পোস্ট কোড',
+                        'save-btn-title'     => 'ঠিকানা সংরক্ষণ করুন',
+                        'select-country'     => 'দেশ নির্বাচন করুন',
+                        'state'              => 'রাজ্য',
+                        'street-address'     => 'সড়ক ঠিকানা',
+                        'title'              => 'গ্রাহকের ঠিকানা তৈরি করুন',
+                        'vat-id'             => 'ভ্যাট আইডি',
+                    ],
+
+                    'edit' => [
+                        'address-1'       => 'ঠিকানা 1',
+                        'address-2'       => 'ঠিকানা 2',
+                        'city'            => 'শহর',
+                        'company-name'    => 'কোম্পানির নাম',
+                        'country'         => 'দেশ',
+                        'default-address' => 'ডিফল্ট ঠিকানা',
+                        'email'           => 'ইমেল',
+                        'first-name'      => 'প্রথম নাম',
+                        'last-name'       => 'শেষ নাম',
+                        'phone'           => 'ফোন',
+                        'post-code'       => 'পোস্ট কোড',
+                        'save-btn-title'  => 'ঠিকানা সংরক্ষণ করুন',
+                        'select-country'  => 'দেশ নির্বাচন করুন',
+                        'state'           => 'রাজ্য',
+                        'street-address'  => 'সড়ক ঠিকানা',
+                        'title'           => 'ঠিকানা সম্পাদনা করুন',
+                        'vat-id'          => 'ভ্যাট আইডি',
+                    ],
+
+                    'create-success'      => 'ঠিকানা সফলভাবে তৈরি হয়েছে',
+                    'success-mass-delete' => 'ঠিকানাগুলি সফলভাবে সরানো হয়েছে',
+                    'update-success'      => 'ঠিকানা সফলভাবে আপডেট হয়েছে',
+                ],
             ],
         ],
 
@@ -1393,53 +1440,6 @@
                 ],
             ],
         ],
-
-        'addresses' => [
-            'create' => [
-                'address-1'          => 'ঠিকানা 1',
-                'address-2'          => 'ঠিকানা 2',
-                'city'               => 'শহর',
-                'company-name'       => 'কোম্পানির নাম',
-                'country'            => 'দেশ',
-                'create-address-btn' => 'নতুন ঠিকানা যুক্ত করুন',
-                'default-address'    => 'ডিফল্ট ঠিকানা',
-                'email'              => 'ইমেল',
-                'first-name'         => 'প্রথম নাম',
-                'last-name'          => 'শেষ নাম',
-                'phone'              => 'ফোন',
-                'post-code'          => 'পোস্ট কোড',
-                'save-btn-title'     => 'ঠিকানা সংরক্ষণ করুন',
-                'select-country'     => 'দেশ নির্বাচন করুন',
-                'state'              => 'রাজ্য',
-                'street-address'     => 'সড়ক ঠিকানা',
-                'title'              => 'গ্রাহকের ঠিকানা তৈরি করুন',
-                'vat-id'             => 'ভ্যাট আইডি',
-            ],
-
-            'edit' => [
-                'address-1'       => 'ঠিকানা 1',
-                'address-2'       => 'ঠিকানা 2',
-                'city'            => 'শহর',
-                'company-name'    => 'কোম্পানির নাম',
-                'country'         => 'দেশ',
-                'default-address' => 'ডিফল্ট ঠিকানা',
-                'email'           => 'ইমেল',
-                'first-name'      => 'প্রথম নাম',
-                'last-name'       => 'শেষ নাম',
-                'phone'           => 'ফোন',
-                'post-code'       => 'পোস্ট কোড',
-                'save-btn-title'  => 'ঠিকানা সংরক্ষণ করুন',
-                'select-country'  => 'দেশ নির্বাচন করুন',
-                'state'           => 'রাজ্য',
-                'street-address'  => 'সড়ক ঠিকানা',
-                'title'           => 'ঠিকানা সম্পাদনা করুন',
-                'vat-id'          => 'ভ্যাট আইডি',
-            ],
-
-            'create-success'      => 'ঠিকানা সফলভাবে তৈরি হয়েছে',
-            'success-mass-delete' => 'ঠিকানাগুলি সফলভাবে সরানো হয়েছে',
-            'update-success'      => 'ঠিকানা সফলভাবে আপডেট হয়েছে',
-        ],
     ],
 
     'marketing' => [