Merge branch 'bagisto/master' into order-workflow-improvements

2020-03-12 16:26:27 +01:00 · 2020-03-12 16:26:27 +01:00 · c14b1c8946
parent f6305b94eb 30f94375f3
commit c14b1c8946
14 changed files with 90 additions and 44 deletions
--- a/composer.lock
+++ b/composer.lock
@ -1512,16 +1512,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v6.18.0",
+            "version": "v6.18.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8"
+                "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
-                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/367c2c8dfdfe83cb2ddbc029c0222174098d093a",
+                "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a",
                "shasum": ""
            },
            "require": {
@ -1654,7 +1654,7 @@
                "framework",
                "laravel"
            ],
-            "time": "2020-03-03T13:14:27+00:00"
+            "time": "2020-03-10T14:11:04+00:00"
        },
        {
            "name": "laravel/helpers",
@ -2054,30 +2054,30 @@
        },
        {
            "name": "markbaker/complex",
-            "version": "1.4.7",
+            "version": "1.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000"
+                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
-                "reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72",
+                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72",
                "shasum": ""
            },
            "require": {
                "php": "^5.6.0|^7.0.0"
            },
            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
-                "phpcompatibility/php-compatibility": "^8.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "phpcompatibility/php-compatibility": "^9.0",
                "phpdocumentor/phpdocumentor": "2.*",
                "phploc/phploc": "2.*",
                "phpmd/phpmd": "2.*",
                "phpunit/phpunit": "^4.8.35|^5.4.0",
                "sebastian/phpcpd": "2.*",
-                "squizlabs/php_codesniffer": "^3.3.0"
+                "squizlabs/php_codesniffer": "^3.4.0"
            },
            "type": "library",
            "autoload": {
@ -2145,7 +2145,7 @@
                "complex",
                "mathematics"
            ],
-            "time": "2018-10-13T23:28:42+00:00"
+            "time": "2020-03-11T20:15:49+00:00"
        },
        {
            "name": "markbaker/matrix",
@ -5094,16 +5094,16 @@
        },
        {
            "name": "vlucas/phpdotenv",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
            "source": {
                "type": "git",
                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156"
+                "reference": "8f7961f7b9deb3b432452c18093cf16f88205902"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156",
-                "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8f7961f7b9deb3b432452c18093cf16f88205902",
+                "reference": "8f7961f7b9deb3b432452c18093cf16f88205902",
                "shasum": ""
            },
            "require": {
@ -5112,8 +5112,12 @@
                "symfony/polyfill-ctype": "^1.9"
            },
            "require-dev": {
+                "ext-filter": "*",
                "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
            },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator."
+            },
            "type": "library",
            "extra": {
                "branch-alias": {
@ -5147,7 +5151,7 @@
                "env",
                "environment"
            ],
-            "time": "2019-09-10T21:37:39+00:00"
+            "time": "2020-03-12T13:44:00+00:00"
        }
    ],
    "packages-dev": [
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@ -55,15 +55,11 @@
        <script type="text/javascript">
            window.flashMessages = [];

-            @if ($success = session('success'))
-                window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
-            @elseif ($warning = session('warning'))
-                window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
-            @elseif ($error = session('error'))
-                window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }];
-            @elseif ($info = session('info'))
-                window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }];
-            @endif
+            @foreach (['success', 'warning', 'error', 'info'] as $key)
+                @if ($value = session($key))
+                    window.flashMessages.push({'type': 'alert-{{ $key }}', 'message': "{{ $value }}" });
+                @endif
+            @endforeach

            window.serverErrors = [];
            @if (isset($errors))
--- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
@ -116,7 +116,7 @@
                return {
                    booking: bookingProduct ? bookingProduct : {

-                        booking_type: 'default',
+                        type: 'default',

                        location: '',

--- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/event.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/event.blade.php
@ -110,7 +110,7 @@

            data: function() {
                return {
-                    tickets: @json($bookingProduct->event_tickets()->get())
+                    tickets: @json($bookingProduct ? $bookingProduct->event_tickets()->get() : [])
                }
            }
        });
--- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/table.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/table.blade.php
@ -31,7 +31,7 @@
            <div class="control-group" :class="[errors.has('booking[qty]') ? 'has-error' : '']">
                <label class="required">{{ __('bookingproduct::app.admin.catalog.products.guest-capacity') }}</label>

-                <input type="text" v-validate="'required|min_value:1'" name="booking[qty]" value="{{ $bookingProduct->qty }}" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.guest-limit') }}&quot;"/>
+                <input type="text" v-validate="'required|min_value:1'" name="booking[qty]" v-model="table_booking.qty" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.guest-limit') }}&quot;"/>
                
                <span class="control-error" v-if="errors.has('booking[qty]')">@{{ errors.first('booking[qty]') }}</span>
            </div>
@ -98,6 +98,8 @@
            data: function() {
                return {
                    table_booking: bookingProduct && bookingProduct.table_slot ? bookingProduct.table_slot : {
+                        qty: {{ $bookingProduct ? $bookingProduct->qty : 0 }},
+
                        price_type: 'guest',

                        guest_limit: 2,
--- a/packages/Webkul/Core/src/Config/concord.php
+++ b/packages/Webkul/Core/src/Config/concord.php
@ -10,6 +10,7 @@ return [
         */

        \Webkul\Attribute\Providers\ModuleServiceProvider::class,
+        \Webkul\BookingProduct\Providers\ModuleServiceProvider::class,
        \Webkul\Category\Providers\ModuleServiceProvider::class,
        \Webkul\Checkout\Providers\ModuleServiceProvider::class,
        \Webkul\Core\Providers\ModuleServiceProvider::class,
--- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php
+++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php
@ -49,7 +49,8 @@ class ProductServiceProvider extends ServiceProvider
     *
     * @return void
     */
-    public function registerConfig(): void {
+    public function registerConfig(): void
+    {
        $this->mergeConfigFrom(
            dirname(__DIR__) . '/Config/product_types.php', 'product_types'
        );
--- a/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
@ -61,19 +61,19 @@ class OrderDataGrid extends DataGrid
            'closure'    => true,
            'wrapper'    => function ($value) {
                if ($value->status == 'processing') {
-                    return '<span class="badge badge-md badge-success">Processing</span>';
+                    return '<span class="badge badge-md badge-success">' . trans('shop::app.customer.account.order.index.processing') . '</span>';
                } elseif ($value->status == 'completed') {
-                    return '<span class="badge badge-md badge-success">Completed</span>';
+                    return '<span class="badge badge-md badge-success">' . trans('shop::app.customer.account.order.index.completed') . '</span>';
                } elseif ($value->status == "canceled") {
-                    return '<span class="badge badge-md badge-danger">Canceled</span>';
+                    return '<span class="badge badge-md badge-danger">' . trans('shop::app.customer.account.order.index.canceled') . '</span>';
                } elseif ($value->status == "closed") {
-                    return '<span class="badge badge-md badge-info">Closed</span>';
+                    return '<span class="badge badge-md badge-info">' . trans('shop::app.customer.account.order.index.closed') . '</span>';
                } elseif ($value->status == "pending") {
-                    return '<span class="badge badge-md badge-warning">Pending</span>';
+                    return '<span class="badge badge-md badge-warning">' . trans('shop::app.customer.account.order.index.pending') . '</span>';
                } elseif ($value->status == "pending_payment") {
-                    return '<span class="badge badge-md badge-warning">Pending Payment</span>';
+                    return '<span class="badge badge-md badge-warning">' . trans('shop::app.customer.account.order.index.pending-payment') . '</span>';
                } elseif ($value->status == "fraud") {
-                    return '<span class="badge badge-md badge-danger">Fraud</span>';
+                    return '<span class="badge badge-md badge-danger">' . trans('shop::app.customer.account.order.index.fraud') . '</span>';
                }
            },
            'filterable' => true,
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@ -243,7 +243,14 @@ return [
                    'order_id' => 'ترتيب',
                    'date' => 'التاريخ',
                    'status' => 'الحالة',
-                    'total' => 'المجموع'
+                    'total' => 'المجموع',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@ -267,7 +267,14 @@ return [
                    'date' => 'Date',
                    'status' => 'Status',
                    'total' => 'Total',
-                    'order_number' => 'Order Number'
+                    'order_number' => 'Order Number',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@ -245,7 +245,14 @@ return [
                    'date' => 'Fecha',
                    'status' => 'Estado',
                    'total' => 'Total',
-                    'order_number' => 'Número de pedido'
+                    'order_number' => 'Número de pedido',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@ -245,7 +245,14 @@ return [
                    'order_id' => 'شماره سفارش',
                    'date' => 'تاریخ',
                    'status' => 'وضعیت',
-                    'total' => 'جمع'
+                    'total' => 'جمع',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@ -262,7 +262,14 @@ return [
                    'date' => 'Datum',
                    'status' => 'Status',
                    'total' => 'Totaal',
-                    'order_number' => 'Bestelnummer'
+                    'order_number' => 'Bestelnummer',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@ -244,7 +244,14 @@ return [
                    'order_id' => 'Pedido ID',
                    'date' => 'Data',
                    'status' => 'Status',
-                    'total' => 'Total'
+                    'total' => 'Total',
+                    'processing' => 'Processing',
+                    'completed' => 'Completed',
+                    'canceled' => 'Canceled',
+                    'closed' => 'Closed',
+                    'pending' => 'Pending',
+                    'pending-payment' => 'Pending Payment',
+                    'fraud' => 'Fraud'
                ],

                'view' => [