diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 6da778870..92b81bc1e 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -116,7 +116,7 @@ class CustomerController extends Controller $this->customer->create($data); - session()->flash('success', trans('admin::app.customers.customers.created')); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer'])); return redirect()->route($this->_config['redirect']); } @@ -159,7 +159,7 @@ class CustomerController extends Controller $this->customer->update(request()->all(),$id); - session()->flash('success', trans('admin::app.customers.customers.updated')); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer'])); return redirect()->route($this->_config['redirect']); } @@ -174,7 +174,7 @@ class CustomerController extends Controller { $this->customer->delete($id); - session()->flash('success', trans('admin::app.customers.customers.deleted')); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer'])); return redirect()->back(); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 35a1b8692..026de76fc 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -81,7 +81,7 @@ class CustomerGroupController extends Controller $this->customerGroup->create($data); - session()->flash('success', trans('admin::app.customers.customers.group-created')); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer Group'])); return redirect()->route($this->_config['redirect']); } @@ -114,7 +114,7 @@ class CustomerGroupController extends Controller $this->customerGroup->update(request()->all(),$id); - session()->flash('success', trans('admin::app.customers.customers.group-updated')); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group'])); return redirect()->route($this->_config['redirect']); } @@ -132,7 +132,7 @@ class CustomerGroupController extends Controller if($group->is_user_defined == 0) { session()->flash('warning', trans('admin::app.customers.customers.group-default')); } else { - session()->flash('success', trans('admin::app.customers.customers.group-deleted')); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group'])); $this->customerGroup->delete($id); } diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 5322928a0..d6d9e1379 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -105,7 +105,7 @@ return [ 'confirm-delete-title' => 'Confirm password before delete', 'delete-last' => 'At least one admin is required.', 'delete-success' => 'Success! User deleted', - 'incorrect-password' => 'The password you entered is incorrect' + 'incorrect-password' => 'The password you entered is incorrect', ], 'sessions' => [ @@ -576,12 +576,6 @@ return [ 'male' => 'Male', 'female' => 'Female', 'phone' => 'Phone', - 'created' => 'Customer created successfully.', - 'updated' => 'Customer updated successfully.', - 'deleted' => 'Customer deleted successfully.', - 'group-created' => 'Customer Group created successfully.', - 'group-updated' => 'Customer Group updated successfully.', - 'group-deleted' => 'Customer Group deleted successfully.', 'group-default' => 'Cannot delete the default group.', ], 'reviews' => [ @@ -642,5 +636,15 @@ return [ 'download' => 'Download', 'csv' => 'CSV', 'xls' => 'XLS' - ] + ], + + 'response' => [ + 'create-success' => ':name created successfully.', + 'update-success' => ':name updated successfully.', + 'delete-success' => ':name deleted successfully.', + 'last-delete-error' => 'At least one :name is required.', + 'user-define-error' => 'Can not delete system :name', + 'attribute-error' => ':name is used in configurable products.', + 'attribute-product-error' => ':name is used in products.' + ], ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php index 893e3b8cd..aef7cfefd 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php @@ -21,7 +21,6 @@ $class = app(current($temp)); $method = end($temp); $value = $class->$method(); - $selectedOption = core()->getConfigData($name) ?? ''; } $channel_locale = []; diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 3b41c858a..e5204eaf9 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -77,7 +77,7 @@ class AttributeController extends Controller $attribute = $this->attribute->create(request()->all()); - session()->flash('success', 'Attribute created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Attribute'])); return redirect()->route($this->_config['redirect']); } @@ -112,7 +112,7 @@ class AttributeController extends Controller $attribute = $this->attribute->update(request()->all(), $id); - session()->flash('success', 'Attribute updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Attribute'])); return redirect()->route($this->_config['redirect']); } @@ -128,14 +128,14 @@ class AttributeController extends Controller $attribute = $this->attribute->findOrFail($id); if(!$attribute->is_user_defined) { - session()->flash('error', 'Can not delete system attribute.'); + session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'attribute'])); } else { try { $this->attribute->delete($id); - session()->flash('success', 'Attribute deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Attribute'])); } catch(\Exception $e) { - session()->flash('error', 'Attribute is used in configurable products.'); + session()->flash('error', trans('admin::app.response.attribute-error', ['name' => 'Attribute'])); } } diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index b0e0c98a4..7e7f5d9e7 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -82,7 +82,7 @@ class AttributeFamilyController extends Controller $attributeFamily = $this->attributeFamily->create(request()->all()); - session()->flash('success', 'Family created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Family'])); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class AttributeFamilyController extends Controller $attributeFamily = $this->attributeFamily->update(request()->all(), $id); - session()->flash('success', 'Family updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Family'])); return redirect()->route($this->_config['redirect']); } @@ -135,13 +135,13 @@ class AttributeFamilyController extends Controller $attributeFamily = $this->attributeFamily->find($id); if ($this->attributeFamily->count() == 1) { - session()->flash('error', 'At least one family is required.'); + session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Family'])); } else if ($attributeFamily->products()->count()) { - session()->flash('error', 'Attribute family is used in products.'); + session()->flash('error', trans('admin::app.response.attribute-product-error', ['name' => 'Attribute family'])); } else { $this->attributeFamily->delete($id); - session()->flash('success', 'Family deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Family'])); } return redirect()->back(); diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index fe29e3610..de9a38360 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -78,7 +78,7 @@ class CategoryController extends Controller $category = $this->category->create(request()->all()); - session()->flash('success', 'Category created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Category'])); return redirect()->route($this->_config['redirect']); } @@ -121,7 +121,7 @@ class CategoryController extends Controller $this->category->update(request()->all(), $id); - session()->flash('success', 'Category updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Category'])); return redirect()->route($this->_config['redirect']); } @@ -140,7 +140,7 @@ class CategoryController extends Controller Event::fire('catalog.category.delete.after', $id); - session()->flash('success', 'Category deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category'])); return redirect()->back(); } diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 61efdb773..84bf72f83 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -88,7 +88,7 @@ class ChannelController extends Controller Event::fire('core.channel.create.after', $channel); - session()->flash('success', 'Channel created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Channel'])); return redirect()->route($this->_config['redirect']); } @@ -134,7 +134,7 @@ class ChannelController extends Controller Event::fire('core.channel.update.after', $channel); - session()->flash('success', 'Channel updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Channel'])); return redirect()->route($this->_config['redirect']); } @@ -156,7 +156,7 @@ class ChannelController extends Controller Event::fire('core.channel.delete.after', $id); - session()->flash('success', 'Channel deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Channel'])); } return redirect()->back(); diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index 425567cca..943fe340f 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -81,7 +81,7 @@ class CurrencyController extends Controller Event::fire('core.currency.create.after', $currency); - session()->flash('success', 'Currency created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Currency'])); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class CurrencyController extends Controller Event::fire('core.currency.update.after', $currency); - session()->flash('success', 'Currency updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Currency'])); return redirect()->route($this->_config['redirect']); } @@ -140,9 +140,9 @@ class CurrencyController extends Controller Event::fire('core.currency.delete.after', $id); if($result) - session()->flash('success', 'Currency deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Currency'])); else - session()->flash('error', 'At least one currency is required.'); + session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Currency'])); } catch (\Exception $e) { session()->flash('error', $e->getMessage()); } diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index c9e79796c..e19ce60ac 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -94,7 +94,7 @@ class ExchangeRateController extends Controller Event::fire('core.exchange_rate.create.after', $exchangeRate); - session()->flash('success', 'Exchange rate created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Exchange rate'])); return redirect()->route($this->_config['redirect']); } @@ -134,7 +134,7 @@ class ExchangeRateController extends Controller Event::fire('core.exchange_rate.update.after', $exchangeRate); - session()->flash('success', 'Exchange rate updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Exchange rate'])); return redirect()->route($this->_config['redirect']); } @@ -148,7 +148,7 @@ class ExchangeRateController extends Controller public function destroy($id) { if($this->exchangeRate->count() == 1) { - session()->flash('error', 'At least one Exchange rate is required.'); + session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Exchange rate'])); } else { Event::fire('core.exchange_rate.delete.before', $id); @@ -156,7 +156,7 @@ class ExchangeRateController extends Controller Event::fire('core.exchange_rate.delete.after', $id); - session()->flash('success', 'Exchange rate deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Exchange rate'])); } return redirect()->back(); diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index 8407c439c..40f8bef93 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -81,7 +81,7 @@ class LocaleController extends Controller Event::fire('core.locale.create.after', $locale); - session()->flash('success', 'Locale created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Locale'])); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class LocaleController extends Controller Event::fire('core.locale.update.after', $locale); - session()->flash('success', 'Locale updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Locale'])); return redirect()->route($this->_config['redirect']); } @@ -133,7 +133,7 @@ class LocaleController extends Controller public function destroy($id) { if($this->locale->count() == 1) { - session()->flash('error', 'At least one locale is required.'); + session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Locale'])); } else { Event::fire('core.locale.delete.before', $id); @@ -141,7 +141,7 @@ class LocaleController extends Controller Event::fire('core.locale.delete.after', $id); - session()->flash('success', 'Locale deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Locale'])); } return redirect()->back(); diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php index ef292e343..5b2611ba2 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php @@ -89,11 +89,11 @@ class AddressController extends Controller } if($this->address->create($data)) { - session()->flash('success', 'Address have been successfully added.'); + session()->flash('success', trans('shop::app.customer.account.address.create.success')); return redirect()->route($this->_config['redirect']); } else { - session()->flash('error', 'Address cannot be added.'); + session()->flash('error', trans('shop::app.customer.account.address.create.error')); return redirect()->back(); } @@ -131,7 +131,7 @@ class AddressController extends Controller $this->address->update($data, $id); - Session()->flash('success','Address Updated Successfully.'); + session()->flash('success', trans('shop::app.customer.account.address.edit.success')); return redirect()->route('customer.address.index'); } @@ -150,7 +150,7 @@ class AddressController extends Controller if($address = $this->address->find($id)) { $address->update(['default_address' => 1]); } else { - session()->flash('success', 'Default Cannot Be Address Changed'); + session()->flash('success', trans('shop::app.customer.account.address.index.default-delete')); } return redirect()->back(); @@ -167,7 +167,7 @@ class AddressController extends Controller { $this->address->delete($id); - session()->flash('success', trans('shop::app.address.delete.success')); + session()->flash('success', trans('shop::app.customer.account.address.delete.success')); return redirect()->back(); } diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 4f002fe0a..56bc7ee91 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -21,7 +21,7 @@ class InventorySourceController extends Controller * @var array */ protected $_config; - + /** * InventorySourceRepository object * @@ -92,7 +92,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.create.after', $inventorySource); - session()->flash('success', 'Inventory source created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Inventory source'])); return redirect()->route($this->_config['redirect']); } @@ -142,7 +142,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.update.after', $inventorySource); - session()->flash('success', 'Inventory source updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Inventory source'])); return redirect()->route($this->_config['redirect']); } @@ -156,7 +156,7 @@ class InventorySourceController extends Controller public function destroy($id) { if($this->inventorySource->count() == 1) { - session()->flash('error', 'At least one inventory source is required.'); + session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Inventory source'])); } else { Event::fire('inventory.inventory_source.delete.before', $id); @@ -164,7 +164,7 @@ class InventorySourceController extends Controller Event::fire('inventory.inventory_source.delete.after', $id); - session()->flash('success', 'Inventory source deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Inventory source'])); } return redirect()->back(); diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 619da0939..fdbdf687f 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -143,7 +143,7 @@ class ProductController extends Controller $product = $this->product->create(request()->all()); - session()->flash('success', 'Product created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Product'])); return redirect()->route($this->_config['redirect'], ['id' => $product->id]); } @@ -176,7 +176,7 @@ class ProductController extends Controller { $product = $this->product->update(request()->all(), $id); - session()->flash('success', 'Product updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Product'])); return redirect()->route($this->_config['redirect']); } @@ -191,7 +191,7 @@ class ProductController extends Controller { $this->product->delete($id); - session()->flash('success', 'Product deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Product'])); return redirect()->back(); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php index 80cd12bde..31ac00329 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php @@ -92,7 +92,7 @@ class ReviewController extends Controller $this->productReview->create($data); - session()->flash('success', 'Review submitted successfully.'); + session()->flash('success', trans('shop::app.response.submit-success', ['name' => 'Product Review'])); return redirect()->route($this->_config['redirect']); } @@ -119,7 +119,7 @@ class ReviewController extends Controller { $this->productReview->delete($id); - session()->flash('success', 'Product Review Successfully Deleted'); + session()->flash('success', trans('shop::app.response.delete-success', ['name' => 'Product Review'])); return redirect()->back(); } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 45a76f16a..2b0a04be8 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -3068,36 +3068,9 @@ section.review { .account-items-list , .edit-form { margin-top: 20px; - .table { - display: none; - } - .responsive-empty { display: block; } - - .responsive-table { - border: 1px solid $border-color; - margin-top: 5px; - width: 100%; - display: block; - - tbody td { - padding: 8px 5px; - - &:first-child { - width: 25%; - } - - &:last-child { - padding-left: 10px; - } - } - } - } - - .account-items-list.table { - display: none; } .control-group .control { @@ -3217,29 +3190,6 @@ section.review { } } - .table{ - display: none; - } - - .responsive-table { - border: 1px solid $border-color; - margin-top: 5px; - width: 100%; - display: block; - - tbody td { - padding: 8px 5px; - - &:first-child { - width: 35%; - } - - &:last-child { - padding-left: 10px; - } - } - } - .totals { .sale-summary { width: 100%; diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index dcf8bc036..61409d369 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -182,7 +182,8 @@ return [ 'make-default' => 'Make Default', 'default' => 'Default', 'contact' => 'Contact', - 'confirm-delete' => 'Do you really want to delete this address?' + 'confirm-delete' => 'Do you really want to delete this address?', + 'default-delete' => 'Default Address Cannot Be Changed' ], 'create' => [ @@ -196,13 +197,16 @@ return [ 'city' => 'City', 'postcode' => 'Postal Code', 'phone' => 'Phone', - 'submit' => 'Save Address' + 'submit' => 'Save Address', + 'success' => 'Address have been successfully added.', + 'error' => 'Address cannot be added.' ], 'edit' => [ 'page-title' => 'Customer - Edit Address', 'title' => 'Edit Address', - 'submit' => 'Save Address' + 'submit' => 'Save Address', + 'success' => 'Address Updated Successfully.' ], 'delete' => [ 'success' => 'Address Successfully Deleted', @@ -471,5 +475,12 @@ return [ 'webkul' => [ 'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved' - ] + ], + + 'response' => [ + 'create-success' => ':name created successfully.', + 'update-success' => ':name updated successfully.', + 'delete-success' => ':name deleted successfully.', + 'submit-success' => ':name submitted successfully.' + ], ]; \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php index 561e77c8a..34f202f10 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php @@ -39,19 +39,19 @@ @foreach($orders as $order) - + #{{ $order->id }} - {{ core()->formatDate($order->created_at, 'd M Y') }} + {{ core()->formatDate($order->created_at, 'd M Y') }} - + {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }} - + @if($order->status == 'processing') Processing @elseif($order->status == 'completed') @@ -81,45 +81,6 @@ - @foreach($orders as $order) - - - - - - - - - - - - - - - - - - - -
- {{ __('shop::app.customer.account.order.index.order_id') }} - - - #{{ $order->id }} - -
- {{ __('shop::app.customer.account.order.index.date') }} - {{ core()->formatDate($order->created_at, 'd M Y') }}
- {{ __('shop::app.customer.account.order.index.total') }} - - {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }} -
- {{ __('shop::app.customer.account.order.index.status') }} - - {{ $order->status_label }} -
- @endforeach - @if (!$orders->count())
{{ __('admin::app.common.no-result-found') }}
@endif diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php index a6be5135d..83686f93c 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php @@ -65,12 +65,12 @@ @foreach ($order->items as $item) - + {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }} - {{ $item->name }} - {{ core()->formatPrice($item->price, $order->order_currency_code) }} - + {{ $item->name }} + {{ core()->formatPrice($item->price, $order->order_currency_code) }} + {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }} @@ -87,10 +87,10 @@ {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - {{ core()->formatPrice($item->total, $order->order_currency_code) }} - {{ number_format($item->tax_percent, 2) }}% - {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} - {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} + {{ core()->formatPrice($item->total, $order->order_currency_code) }} + {{ number_format($item->tax_percent, 2) }}% + {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} + {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} @endforeach @@ -98,89 +98,6 @@ - @foreach ($order->items as $item) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ __('shop::app.customer.account.order.view.SKU') }} - - {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }} -
- {{ __('shop::app.customer.account.order.view.product-name') }} - {{ $item->name }}
- {{ __('shop::app.customer.account.order.view.price') }} - - {{ core()->formatPrice($item->price, $order->order_currency_code) }} -
- {{ __('shop::app.customer.account.order.view.item-status') }} - - - {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }} - - - - {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }} - - - - {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }} - - - - {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - -
- {{ __('shop::app.customer.account.order.view.subtotal') }} - - {{ core()->formatPrice($item->total, $order->order_currency_code) }} -
- {{ __('shop::app.customer.account.order.view.tax-percent') }} - - {{ number_format($item->tax_percent, 2) }}% -
- {{ __('shop::app.customer.account.order.view.tax-amount') }} - - {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} -
- {{ __('shop::app.customer.account.order.view.grand-total') }} - - {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} -
- @endforeach -
diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js index acf0d5b90..cc2d629f2 100755 --- a/packages/Webkul/Shop/webpack.mix.js +++ b/packages/Webkul/Shop/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/themes/default/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/themes/default/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue index 25924a3d7..febc6d92d 100755 --- a/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue +++ b/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue @@ -17,7 +17,7 @@ data () { return { - datepicker: null + datepicker: null } }, diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index aec5755a6..09823bfd9 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -294,6 +294,32 @@ h2 { } } +@media only screen and (max-width: 770px) { + .table { + table thead { + display: none; + } + + table tbody { + tr td:before { + content: attr(data-value); + font-size: 15px; + font-weight: 600; + margin-right: 20px; + } + + td { + border-bottom: none; + display: block; + } + + tr { + border: 1px solid #C7C7C7; + } + } + } +} + .dropdown-btn { min-width: 150px; text-align: left; diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index 731f5fe79..f1d1f851e 100755 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -83,7 +83,7 @@ class RoleController extends Controller Event::fire('user.role.create.after', $role); - session()->flash('success', 'Role created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Role'])); return redirect()->route($this->_config['redirect']); } @@ -121,7 +121,7 @@ class RoleController extends Controller Event::fire('user.role.update.after', $role); - session()->flash('success', 'Role updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role'])); return redirect()->route($this->_config['redirect']); } @@ -143,7 +143,7 @@ class RoleController extends Controller Event::fire('user.role.delete.after', $id); - session()->flash('success', 'Role source deleted successfully.'); + session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Role'])); } return redirect()->back(); diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index e79f7d0fb..19bafe6d6 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -98,7 +98,7 @@ class UserController extends Controller Event::fire('user.admin.delete.after', $admin); - session()->flash('success', 'User created successfully.'); + session()->flash('success', trans('admin::app.response.create-success', ['name' => 'User'])); return redirect()->route($this->_config['redirect']); } @@ -146,7 +146,7 @@ class UserController extends Controller Event::fire('user.admin.update.after', $admin); - session()->flash('success', 'User updated successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User'])); return redirect()->route($this->_config['redirect']); } @@ -172,7 +172,7 @@ class UserController extends Controller Event::fire('user.admin.delete.after', $id); - session()->flash('success', 'Admin source deleted successfully.'); + session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source'])); } return redirect()->back(); diff --git a/public/installer/Classes/vendor/bin/composer/.htaccess b/public/installer/Classes/vendor/bin/composer/.htaccess deleted file mode 100644 index 14249c50b..000000000 --- a/public/installer/Classes/vendor/bin/composer/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all \ No newline at end of file diff --git a/public/installer/Classes/vendor/bin/composer/cache/.htaccess b/public/installer/Classes/vendor/bin/composer/cache/.htaccess deleted file mode 100644 index 14249c50b..000000000 --- a/public/installer/Classes/vendor/bin/composer/cache/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all \ No newline at end of file