Merge branch 'master' of https://github.com/bagisto/bagisto
This commit is contained in:
jitendra
commit
44c17ef8e4
|
|
@ -2,6 +2,9 @@ name: CI
|
|||
|
||||
on: [push, pull_request]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
runs-on: ${{ matrix.operating-system }}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,203 @@
|
|||
|
||||
This changelog consists of the bug & security fixes and new features being included in the releases listed below.
|
||||
|
||||
## **v1.4.4 (29th of August 2022)** - *Release*
|
||||
|
||||
* #5584 [feature] - there should be an feature so that when we click on mark as read , notification box should close.
|
||||
|
||||
* #5463 [feature] - there should be a button so that we should clear all filters.
|
||||
|
||||
* #6556 [enhancement] - Cart Rule -. Validation should be applied in Coupon Code uses per customer and used per coupon section.
|
||||
|
||||
* #6555 [enhancement] - Cart Rule - Auto Generate Coupon Code details at bottom must not visible when we switch to Manual Coupon Code.
|
||||
|
||||
* #6501 [enhancement] - Cart item prices rounded with precision of 2 resulting in rounding errors after applying taxes.
|
||||
|
||||
* #6494 [enhancement] - The product's URL_KEY should not be changed if the admin is editing the product's name for another locale.
|
||||
|
||||
* #6464 [enhancement] - UI - In Table Booking Product, Special Request/Notes must be in Bold for Main Cart.
|
||||
|
||||
* #6458 [enhancement] - There should be the validations for the input fields if the admin is trying to create catalog rules.
|
||||
|
||||
* #6452 [enhancement] - The page should be open on the next tab when the admin is trying to view the CMS pages.
|
||||
|
||||
* #6427 [enhancement] - The mouse property should be not-allowed if the cart is empty. in default theme.
|
||||
|
||||
* #6426 [enhancement] - The warning message should be correct if the admin is trying to ship the invalid product quantity.
|
||||
|
||||
* #6417 [enhancement] - There should be a flash message [ Coupan is already applied ] if the user is trying to apply the same coupon multiple times.
|
||||
|
||||
* #6408 [enhancement] - The name of the applied filters should be meaningful if the customer is trying to filter the orders.
|
||||
|
||||
* #6393 [enhancement] - The page should not be refreshed if the customer is trying to apply the same coupon multiple times.
|
||||
|
||||
* #6371 [enhancement] - There should be a flash message for customers when the cart rule is applied on the checkout page.
|
||||
|
||||
* #6358 [enhancement] - Unable to see any notification on Coupon Applied on the Checkout Page.
|
||||
|
||||
* #6355 [enhancement] - There should be a preview option in the CMS pages table.
|
||||
|
||||
* #6327 [enhancement] - Add Missing Language Folder In All Package
|
||||
|
||||
* #6273 [enhancement] - There should be a tooltip message, after copying the wishlist share link
|
||||
|
||||
* #5801 [enhancement] - Maximum video uploading size should be mentioned when we create product.
|
||||
|
||||
* #5464 [enhancement] - there should be an image icon of user profile image.
|
||||
|
||||
* #6545 [fixed] - The admin should be able to create transactions only with the Grand Total amount of the order.
|
||||
|
||||
* #6406 [fixed] - Discount should be shown only for the product for which we created a catalog rule.
|
||||
|
||||
* #6312 [fixed] - The billing address should not be saved multiple times, if the customer is clicking on save address checkbox in multiple times.
|
||||
|
||||
* #6654 [fixed] - The size of the image card should be fixed. on the home page.
|
||||
|
||||
* #6644 [fixed] - Trimming should be added for the search string.
|
||||
|
||||
* #6640 [fixed] - There should not be any alert box if the admin is trying to filter the products.
|
||||
|
||||
* #6635 [fixed] - The page should not be redirected to the wishlist page when the customer removes any product from the wishlist.
|
||||
|
||||
* #6632 [fixed] - There add to cart and the wishlist button are adjusting if the customer is trying to view any product.
|
||||
|
||||
* #6609 [fixed] - The wishlist should not get empty after deleting the all product of the second-page wishlist.
|
||||
|
||||
* #6606 [fixed] - The admin should be able to upload and remove the product's image.
|
||||
|
||||
* #6558 [fixed] - The cross icon should be just before the calendar icon if the customer is trying to select the appointment date for booking the product.
|
||||
|
||||
* #6554 [fixed] - The discount amount cannot be greater than 100 if the action type is the Percentage of the product.
|
||||
|
||||
* #6547 [fixed] - The product video should be played properly if any.
|
||||
|
||||
* #6518 [fixed] - The admin should be able to update the product's status by mass action.
|
||||
|
||||
* #6514 [fixed] - The save as category button should not be clicked automatically if the admin is pressing the enter key for the searching product.
|
||||
|
||||
* #6509 [fixed] - There is an exception if the admin is trying to search products from the category page.
|
||||
|
||||
* #6507 [fixed] - Notification url is broken when admin_url is changed.
|
||||
|
||||
* #6505 [fixed] - The model box should be in the center of the page if the user is clicking on Quick view for any produt.
|
||||
|
||||
* #6492 [fixed] - There is a UI issue if the user is trying to view the compared products in Arabic locale.
|
||||
|
||||
* #6485 [fixed] - The trash icon should be on the right side of the text if the user is trying to view the shopping cart in the Arabic locale.
|
||||
|
||||
* #6484 [fixed] - The admin is not able to logout on the mobile view.
|
||||
|
||||
* #6479 [fixed] - The position of the top bar should be fixed if the customer is trying to view any order in mobile view.
|
||||
|
||||
* #6471 [fixed] - UI Issue - In Customer Profile Edit option, there we can see the Calendar Logo at DOB is inappropriate.
|
||||
|
||||
* #6469 [fixed] - Translation Issue in the Configure Section related to Number.
|
||||
|
||||
* #6463 [fixed] - There should not be an exception if the admin is trying to add a new variant for the configurable product.
|
||||
|
||||
* #6461 [fixed] - There should not be any warning message for the default empty option if the admin is trying to create/edit any attribute.
|
||||
|
||||
* #6459 [fixed] - Only the review should be deleted which the user wants to delete.
|
||||
|
||||
* #6453 [fixed] - The new customer is not able to login properly when the another user is logging out.
|
||||
|
||||
* #6447 [fixed] - There should not be an exception if the customer is trying to add that product to the wishlist which is deleted by the admin.
|
||||
|
||||
* #6444 [fixed] - The page should be redirected to the login page if the guest user is trying to move products from compare to wishlist.
|
||||
|
||||
* #6443 [fixed] - The height of Add to cart button should be a little less on compare page.
|
||||
|
||||
* #6442 [fixed] - The products should be in proper alignment if there are multiple products in the compare list.
|
||||
|
||||
* #6441 [fixed] - The customer should be able to share the wishlist product if the share link is already generated.
|
||||
|
||||
* #6434 [fixed] - There should not be any translation issue in the checkout page, if the customer is trying to place an order.
|
||||
|
||||
* #6430 [fixed] - The admin should not be able to create a transaction for an invoice with the incorrect Transaction amount
|
||||
|
||||
* #6429 [fixed] - The user should not be able to add products into the cart with 0 quantity.
|
||||
|
||||
* #6425 [fixed] - The sidebar submenu dropdown icon should be shown properly if the admin is changing the English from LTR to RTL.
|
||||
|
||||
* #6423 [fixed] - The order status should be shown properly in the admin panel. if the status of the order is payment pending.
|
||||
|
||||
* #6419 [fixed] - There is an exception if the admin is trying to add transactions for any invoice.
|
||||
|
||||
* #6407 [fixed] - The user should not be able to place the order if the user is inactive.
|
||||
|
||||
* #6402 [fixed] - Only the address should be deleted which the user wants to delete.
|
||||
|
||||
* #6401 [fixed] - There is no option to view compare items for guests.
|
||||
|
||||
* #6400 [fixed] - The success message should not be shown multiple times if the user is trying to remove the applied coupon.
|
||||
|
||||
* #6397 [fixed] - The should not be an exception if the guest is trying to log in after deleting all the cart items.
|
||||
|
||||
* #6390 [fixed] - The radio button should be toggle only after clicking on the radio button's in admin panel
|
||||
|
||||
* #6389 [fixed] - The share wishlist and delete button should not overlap the sidebar in mobile view.
|
||||
|
||||
* #6386 [fixed] - The Products Ordered label should be highlighted if there is an error, while the admin is trying to create a ship for the order in dark mode.
|
||||
|
||||
* #6385 [fixed] - There should be a search icon if the customer is trying to search the orders.
|
||||
|
||||
* #6384 [fixed] - The product's image should not be out of the product card if the user is trying to view products in list mode.
|
||||
|
||||
* #6370 [fixed] - At least one shipping and payment method should be available.
|
||||
|
||||
* #6369 [fixed] - The product images are overriding if there are multiple products in the cart.
|
||||
|
||||
* #6368 [fixed] - There should be an option to update the cart if the customer is adding downloadable and simple products into the cart.
|
||||
|
||||
* #6366 [fixed] - The product's image is adjusted when the user is trying to view any variant of the configurable product
|
||||
|
||||
* #6365 [fixed] - The bullet symbol should be visible if the user is trying to change the product's image in a quick view popup box.
|
||||
|
||||
* #6364 [fixed] - The warning message should be correct when the condition is not matching with cart rule while the user is applying a coupon.
|
||||
|
||||
* #6362 [fixed] - There should be some space between the share and delete buttons on the wishlist page.
|
||||
|
||||
* #6349 [fixed] - The filter value should be correct if the admin is trying to filter the customers by the status filter
|
||||
|
||||
* #6346 [fixed] - There should not be any extra space between the update cart and the delete all items button, on the shopping cart page.
|
||||
|
||||
* #6344 [fixed] - The calendar icon is not showing when the admin is trying to filter the orders by date in dark mode.
|
||||
|
||||
* #6341 [fixed] - There is some extra space between the product image and add to cart button in the mobile view
|
||||
|
||||
* #6340 [fixed] - By default maximum price should be selected if the user is trying to filter a product by price filter.
|
||||
|
||||
* #6339 [fixed] - The Add to cart button should not be disabled if any one product is inactive of the group product.
|
||||
|
||||
* #6335 [fixed] - The translation is missing for slot dropdown if the user is trying to book any product
|
||||
|
||||
* #6334 [fixed] - The quantity field should not take a negative value if the admin is trying to edit the quantity
|
||||
|
||||
* #6333 [fixed] - The country dropdown should be in the Ascending order when the customer is adding the delivery address on the checkout page.
|
||||
|
||||
* #6332 [fixed] - The calendar Icon should be on the left side of the input box in the Arabic locale when the customer is editing the profile.
|
||||
|
||||
* #6331 [fixed] - The location and the calendar Icon should be slightly right side in the Arabic locale when the customer is trying to book any product.
|
||||
|
||||
* #6324 [fixed] - The warning message should be correct if the admin is trying to upload an invalid image format for the profile image.
|
||||
|
||||
* #6319 [fixed] - The calendar icon is in the center of the input box. if the customer is trying to book the product.
|
||||
|
||||
* #6318 [fixed] - The add to cart button should be in proper alignment inside the compare page.
|
||||
|
||||
* #6317 [fixed] - The page should be redirected to the product view page. if the user clicks on the product image inside the mini cart.
|
||||
|
||||
* #6313 [fixed] - The warning message should be correct if the customer is selecting the PayPal Smart Button payment method with an invalid country code
|
||||
|
||||
* #6288 [fixed] - The delete button is overriding on share button if the customer is trying to view the wishlist products on mobile view.
|
||||
|
||||
* #6277 [fixed] - Checkout redirects when a carrier has more than one shipping method
|
||||
|
||||
* #6276 [fixed] - The product's image should be visible properly in mobile view.
|
||||
|
||||
* #6271 [fixed] - There should not be any warning message if the user is trying to book a rental product for multiple hours.
|
||||
|
||||
|
||||
## **v1.4.3 (20th of April 2022)** - *Release*
|
||||
|
||||
* #6213 [feature] - Command For Bagisto Publish
|
||||
|
|
|
|||
|
|
@ -118,6 +118,22 @@ class ConfigurationController extends Controller
|
|||
if (! $atLeastOneCarrierEnabled) {
|
||||
session()->flash('error', trans('admin::app.configuration.enable-atleast-one-shipping'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
} elseif (isset($data['sales']['paymentmethods'])) {
|
||||
$atLeastOnePaymentMethodEnabled = false;
|
||||
|
||||
foreach ($data['sales']['paymentmethods'] as $paymentMethod) {
|
||||
if ($paymentMethod['active']) {
|
||||
$atLeastOnePaymentMethodEnabled = true;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $atLeastOnePaymentMethodEnabled) {
|
||||
session()->flash('error', trans('admin::app.configuration.enable-atleast-one-payment'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,18 +80,34 @@ class TransactionController extends Controller
|
|||
|
||||
$invoice = $this->invoiceRepository->where('increment_id', $request->invoice_id)->first();
|
||||
|
||||
if ($invoice) {
|
||||
if (! $invoice) {
|
||||
session()->flash('error', trans('admin::app.sales.transactions.response.invoice-missing'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$transactionAmtBefore = $this->orderTransactionRepository->where('invoice_id', $invoice->id)->sum('amount');
|
||||
|
||||
$transactionAmtfinal = $request->amount + $transactionAmtBefore;
|
||||
|
||||
if ($invoice->state == 'paid') {
|
||||
session()->flash('info', trans('admin::app.sales.transactions.response.already-paid'));
|
||||
|
||||
return redirect(route('admin.sales.transactions.index'));
|
||||
}
|
||||
|
||||
if ($request->amount > $invoice->base_grand_total) {
|
||||
if ($transactionAmtfinal > $invoice->base_grand_total) {
|
||||
session()->flash('info', trans('admin::app.sales.transactions.response.transaction-amount-exceeds'));
|
||||
|
||||
return redirect(route('admin.sales.transactions.create'));
|
||||
} else {
|
||||
}
|
||||
|
||||
if ($request->amount <= 0) {
|
||||
session()->flash('info', trans('admin::app.sales.transactions.response.transaction-amount-zero'));
|
||||
|
||||
return redirect(route('admin.sales.transactions.create'));
|
||||
}
|
||||
|
||||
$order = $this->orderRepository->find($invoice->order_id);
|
||||
|
||||
$randomId = random_bytes(20);
|
||||
|
|
@ -127,12 +143,6 @@ class TransactionController extends Controller
|
|||
|
||||
return redirect(route('admin.sales.transactions.index'));
|
||||
}
|
||||
}
|
||||
|
||||
session()->flash('error', trans('admin::app.sales.transactions.response.invoice-missing'));
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the view for the specified resource.
|
||||
|
|
|
|||
|
|
@ -523,6 +523,7 @@ return [
|
|||
'transaction-saved' => 'تم حفظ الصفقة',
|
||||
'already-paid' => 'تم دفع هذه الفاتورة بالفعل',
|
||||
'transaction-amount-exceeds' => 'المبلغ المحدد لهذه المعاملة أكبر من المبلغ الإجمالي للفاتورة.',
|
||||
'transaction-amount-zero' => 'يمكن أن يكون مبلغ الصفقة صفرًا أو أقل',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -741,6 +742,7 @@ return [
|
|||
'no' => 'لا.',
|
||||
'delete' => 'احذف',
|
||||
'enable-atleast-one-shipping' => 'تفعيل طريقة شحن واحدة على الأقل.',
|
||||
'enable-atleast-one-payment' => 'تفعيل طريقة دفع واحدة على الأقل.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'فئات الضرائب',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'transaction-saved' => 'Die Transaktion wurde gespeichert',
|
||||
'already-paid' => 'Diese Rechnung wurde bereits bezahlt',
|
||||
'transaction-amount-exceeds' => 'Der angegebene Betrag dieser Transaktion übersteigt den Gesamtbetrag der Rechnung.',
|
||||
'transaction-amount-zero' => 'Der Transaktionsbetrag kann Null oder weniger betragen',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -733,6 +734,8 @@ return [
|
|||
'no' => 'Nein',
|
||||
'delete' => 'Löschen',
|
||||
'enable-atleast-one-shipping' => 'Aktivieren Sie mindestens eine Versandart.',
|
||||
'enable-atleast-one-payment' => 'Aktivieren Sie mindestens eine Zahlungsmethode.',
|
||||
|
||||
'tax-categories' =>
|
||||
[
|
||||
'title' => 'Steuerkategorien',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -524,6 +524,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -743,6 +744,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Borrar',
|
||||
'enable-atleast-one-shipping' => 'Habilite al menos un método de envío.',
|
||||
'enable-atleast-one-payment' => 'Habilite al menos un método de pago.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorías de impuestos',
|
||||
|
|
|
|||
|
|
@ -521,6 +521,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -726,6 +727,7 @@ return [
|
|||
'no' => 'خیر',
|
||||
'delete' => 'حذف',
|
||||
'enable-atleast-one-shipping' => 'حداقل یک روش حمل و نقل را فعال کنید.',
|
||||
'enable-atleast-one-payment' => 'حداقل یک روش پرداخت را فعال کنید.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'دسته بندی های مالیات',
|
||||
|
|
|
|||
|
|
@ -524,7 +524,8 @@ return [
|
|||
'invoice-missing' => 'Ce numéro de facture n\'existe pas',
|
||||
'transaction-saved' => 'La transaction a été enregistrée',
|
||||
'already-paid' => 'Cette facture a déjà été payée',
|
||||
'transaction-amount-exceeds' => 'Le montant de cette transaction dépasse le montant total de la facture.',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less.',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -746,6 +747,7 @@ return [
|
|||
'no' => 'Non',
|
||||
'delete' => 'Effacer',
|
||||
'enable-atleast-one-shipping' => 'Activez au moins une méthode d\'expédition.',
|
||||
'enable-atleast-one-payment' => 'Activez au moins un mode de paiement.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Catégories de taxes',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -523,6 +523,7 @@ return [
|
|||
'transaction-saved' => 'लेन-देन सहेजा गया है',
|
||||
'already-paid' => 'इस चालान का भुगतान पहले ही किया जा चुका है',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -744,6 +745,7 @@ return [
|
|||
'no' => 'नहीं',
|
||||
'delete' => 'हटाएं',
|
||||
'enable-atleast-one-shipping' => 'कम से कम एक शिपिंग विधि सक्षम करें।',
|
||||
'enable-atleast-one-payment' => 'कम से कम एक भुगतान विधि सक्षम करें।',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'कर श्रेणियाँ',
|
||||
|
|
|
|||
|
|
@ -521,6 +521,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -731,6 +732,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Elimina',
|
||||
'enable-atleast-one-shipping' => 'Abilita almeno un metodo di spedizione.',
|
||||
'enable-atleast-one-payment' => 'Abilita almeno un metodo di pagamento.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorie IVA',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -517,6 +517,7 @@ return [
|
|||
'transaction-saved' => 'De transactie is geregistreerd',
|
||||
'already-paid' => 'Dit factuur is al voldaan',
|
||||
'transaction-amount-exceeds' => 'Het opgegeven bedrag van deze transactie overschrijdt het totaalbedrag van de factuur.',
|
||||
'transaction-amount-zero' => 'Transactiebedrag kan nul of minder zijn',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -725,6 +726,7 @@ return [
|
|||
'no' => 'Nee',
|
||||
'delete' => 'Verwijder',
|
||||
'enable-atleast-one-shipping' => 'Schakel ten minste één verzendmethode in.',
|
||||
'enable-atleast-one-payment' => 'Schakel ten minste één betaalmethode in.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'BTW categorieën',
|
||||
|
|
|
|||
|
|
@ -517,6 +517,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -726,6 +727,7 @@ return [
|
|||
'no' => 'Nie',
|
||||
'delete' => 'Usuń',
|
||||
'enable-atleast-one-shipping' => 'Włącz co najmniej jedną metodę wysyłki.',
|
||||
'enable-atleast-one-payment' => 'Włącz co najmniej jedną formę płatności.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Kategorie podatkowe',
|
||||
|
|
|
|||
|
|
@ -516,6 +516,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -724,6 +725,7 @@ return [
|
|||
'no' => 'Não',
|
||||
'delete' => 'Deletar',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Categorias de Imposto',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Включите хотя бы один способ доставки.',
|
||||
'enable-atleast-one-payment' => 'Включите хотя бы один способ оплаты.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@ return [
|
|||
'transaction-saved' => 'The transaction has been saved',
|
||||
'already-paid' => 'This invoice has already been paid',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -747,6 +748,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => 'Delete',
|
||||
'enable-atleast-one-shipping' => 'Enable atleast one shipping method.',
|
||||
'enable-atleast-one-payment' => 'Enable atleast one payment method.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Tax Categories',
|
||||
|
|
|
|||
|
|
@ -517,6 +517,7 @@ return [
|
|||
'transaction-saved' => 'İşlem kaydedildi',
|
||||
'already-paid' => 'Bu fatura zaten ödendi',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -731,6 +732,7 @@ return [
|
|||
'no' => 'Hayır',
|
||||
'delete' => 'Sil',
|
||||
'enable-atleast-one-shipping' => 'En az bir gönderim yöntemini etkinleştirin.',
|
||||
'enable-atleast-one-payment' => 'En az bir ödeme yöntemini etkinleştirin.',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => 'Vergi Kategorileri',
|
||||
|
|
|
|||
|
|
@ -517,6 +517,7 @@ return [
|
|||
'transaction-saved' => '交易已保存',
|
||||
'already-paid' => '此发票已支付',
|
||||
'transaction-amount-exceeds' => 'The specified amount of this transaction exceeds the total amount of the invoice.',
|
||||
'transaction-amount-zero' => 'Transaction amount can be zero or less',
|
||||
],
|
||||
],
|
||||
],
|
||||
|
|
@ -726,6 +727,7 @@ return [
|
|||
'no' => 'No',
|
||||
'delete' => '删除',
|
||||
'enable-atleast-one-shipping' => '啟用至少一種運輸方式',
|
||||
'enable-atleast-one-payment' => '啟用至少一種付款方式。',
|
||||
|
||||
'tax-categories' => [
|
||||
'title' => '税分类',
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row,'')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<span class="control-error" v-if="errors.has(adminName(row))">@{{ errors.first(adminName(row)) }}</span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -329,7 +329,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required|numeric'" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row,'')" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<span class="control-error" v-if="errors.has(sortOrderName(row))">@{{ errors.first(sortOrderName(row)) }}</span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -458,7 +458,7 @@
|
|||
return '';
|
||||
}
|
||||
|
||||
return ('{{ app()->getLocale() }}' === localeCode) ? 'required' : '';
|
||||
return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.admin_name') }}""/>
|
||||
<span class="control-error" v-if="errors.has(adminName(row))" v-text="errors.first(adminName(row))"></span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -401,7 +401,7 @@
|
|||
|
||||
<td>
|
||||
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
|
||||
<input type="text" v-validate="'required|numeric'" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<input type="text" v-validate="getOptionValidation(row, '')" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as=""{{ __('admin::app.catalog.attributes.position') }}""/>
|
||||
<span class="control-error" v-if="errors.has(sortOrderName(row))" v-text="errors.first(sortOrderName(row))"></span>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -506,10 +506,12 @@
|
|||
'isDelete': false,
|
||||
};
|
||||
|
||||
if (option.label) {
|
||||
if (! option.label) {
|
||||
self.isNullOptionChecked = true;
|
||||
self.idNullOption = option.id;
|
||||
row['notRequired'] = true;
|
||||
} else {
|
||||
row['notRequired'] = false;
|
||||
}
|
||||
|
||||
option.translations.forEach((translation) => {
|
||||
|
|
@ -596,7 +598,7 @@
|
|||
return '';
|
||||
}
|
||||
|
||||
return (this.appLocale === localeCode) ? 'required' : '';
|
||||
return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
|
||||
<script type="text/x-template" id="group-list-template">
|
||||
<div style="margin-top: 20px">
|
||||
<button type="button" style="margin-bottom : 20px" class="btn btn-md btn-primary" @click="showModal('addGroupForm')">
|
||||
<button type="button" style="margin-bottom : 20px" class="btn btn-md btn-primary" @click="$root.showModal('addGroupForm')">
|
||||
{{ __('admin::app.catalog.families.add-group-title') }}
|
||||
</button>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ class AttributeFamilyRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Attribute\Contracts\AttributeFamily';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ class AttributeGroupRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Attribute\Contracts\AttributeGroup';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ class AttributeOptionRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Attribute\Contracts\AttributeOption';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@ use Webkul\Core\Eloquent\Repository;
|
|||
|
||||
class AttributeOptionTranslationRepository extends Repository
|
||||
{
|
||||
|
||||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Attribute\Contracts\AttributeOptionTranslation';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ class AttributeRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\Attribute\Contracts\Attribute';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class BookingProductAppointmentSlotRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProductAppointmentSlot';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class BookingProductDefaultSlotRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProductDefaultSlot';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ class BookingProductEventTicketRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProductEventTicket';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class BookingProductRentalSlotRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProductRentalSlot';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ class BookingProductRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProduct';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class BookingProductTableSlotRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\BookingProductTableSlot';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ class BookingRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\BookingProduct\Contracts\Booking';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -172,7 +172,19 @@ class Booking extends Virtual
|
|||
|
||||
$bookingProduct = $this->getBookingProduct($data['product_id']);
|
||||
|
||||
if ($bookingProduct->type == 'event') {
|
||||
|
||||
if ($bookingProduct->type == 'rental') {
|
||||
if (isset($data['booking']['slot']['from'])) {
|
||||
$time = $data['booking']['slot']['to'] - $data['booking']['slot']['from'];
|
||||
$hours = floor($time / 60) / 60;
|
||||
|
||||
if ($hours > 1) {
|
||||
return trans('shop::app.checkout.cart.integrity.select_hourly_duration');
|
||||
}
|
||||
}
|
||||
|
||||
$products = parent::prepareForCart($data);
|
||||
} elseif ($bookingProduct->type == 'event') {
|
||||
if (
|
||||
Carbon::now() > $bookingProduct->available_from
|
||||
&& Carbon::now() > $bookingProduct->available_to
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ class CmsRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CMS\Contracts\CmsPage';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ class CartRuleCouponRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CartRule\Contracts\CartRuleCoupon';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class CartRuleCouponUsageRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CartRule\Contracts\CartRuleCouponUsage';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class CartRuleCustomerRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CartRule\Contracts\CartRuleCustomer';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ class CartRuleRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\CartRule\Contracts\CartRule';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ class CatalogRuleProductPriceRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CatalogRule\Contracts\CatalogRuleProductPrice';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class CatalogRuleProductRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\CatalogRule\Contracts\CatalogRuleProduct';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@ class CatalogRuleRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\CatalogRule\Contracts\CatalogRule::class;
|
||||
return 'Webkul\CatalogRule\Contracts\CatalogRule';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ class CategoryRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Category\Contracts\Category::class;
|
||||
return 'Webkul\Category\Contracts\Category';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class CartAddressRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Checkout\Contracts\CartAddress';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,9 @@ class CartItemRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Checkout\Contracts\CartItem';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class CartRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return Mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Checkout\Contracts\Cart';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ class ChannelRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Core\Contracts\Channel::class;
|
||||
return 'Webkul\Core\Contracts\Channel';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class CoreConfigRepository extends Repository
|
|||
*/
|
||||
public function model(): string
|
||||
{
|
||||
return CoreConfig::class;
|
||||
return 'Webkul\Core\Contracts\CoreConfig';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ class CountryRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Core\Contracts\Country';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ class CountryStateRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Core\Contracts\CountryState';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ class CurrencyRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Core\Contracts\Currency::class;
|
||||
return 'Webkul\Core\Contracts\Currency';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ class ExchangeRateRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Core\Contracts\CurrencyExchangeRate::class;
|
||||
return 'Webkul\Core\Contracts\CurrencyExchangeRate';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ class LocaleRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Core\Contracts\Locale::class;
|
||||
return 'Webkul\Core\Contracts\Locale';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ class SliderRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Core\Contracts\Slider';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ class SubscribersListRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Core\Contracts\SubscribersList';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@
|
|||
|
||||
.main-container-wrapper .product-card .product-image img {
|
||||
max-width: 100%;
|
||||
height: 260px;
|
||||
object-fit: cover;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -179,6 +179,7 @@ class WishlistController extends Controller
|
|||
$customer = auth()->guard('customer')->user();
|
||||
|
||||
$customerWishlistItems = $customer->wishlist_items;
|
||||
$referer = strtok(request()->headers->get('referer'), '?');
|
||||
|
||||
foreach ($customerWishlistItems as $customerWishlistItem) {
|
||||
if ($itemId == $customerWishlistItem->id) {
|
||||
|
|
@ -186,7 +187,7 @@ class WishlistController extends Controller
|
|||
|
||||
session()->flash('success', trans('customer::app.wishlist.removed'));
|
||||
|
||||
return redirect()->route('customer.wishlist.index');
|
||||
return redirect()->to($referer);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class CustomerAddressRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Customer\Contracts\CustomerAddress';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,11 @@ class CustomerGroupRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Customer\Contracts\CustomerGroup::class;
|
||||
return 'Webkul\Customer\Contracts\CustomerGroup';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ class CustomerRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Customer\Contracts\Customer::class;
|
||||
return 'Webkul\Customer\Contracts\Customer';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ class WishlistRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return \Webkul\Customer\Contracts\Wishlist::class;
|
||||
return 'Webkul\Customer\Contracts\Wishlist';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ class InventorySourceRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Inventory\Contracts\InventorySource::class;
|
||||
return 'Webkul\Inventory\Contracts\InventorySource';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ class CampaignRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Marketing\Contracts\Campaign::class;
|
||||
return 'Webkul\Marketing\Contracts\Campaign';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ class EventRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Marketing\Contracts\Event::class;
|
||||
return 'Webkul\Marketing\Contracts\Event';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ class TemplateRepository extends Repository
|
|||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Marketing\Contracts\Template::class;
|
||||
return 'Webkul\Marketing\Contracts\Template';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class NotificationRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Notification\Contracts\Notification';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class ProductAttributeValueRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductAttributeValue';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class ProductBundleOptionProductRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductBundleOptionProduct';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class ProductBundleOptionRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductBundleOption';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ class ProductCustomerGroupPriceRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductCustomerGroupPrice';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class ProductDownloadableLinkRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductDownloadableLink';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class ProductDownloadableSampleRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductDownloadableSample';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class ProductFlatRepository extends Repository
|
|||
*/
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Product\Contracts\ProductFlat::class;
|
||||
return 'Webkul\Product\Contracts\ProductFlat';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@ use Illuminate\Support\Str;
|
|||
|
||||
class ProductGroupedProductRepository extends Repository
|
||||
{
|
||||
public function model()
|
||||
/**
|
||||
* Specify model.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductGroupedProduct';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class ProductImageRepository extends ProductMediaRepository
|
|||
*/
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Product\Contracts\ProductImage::class;
|
||||
return 'Webkul\Product\Contracts\ProductImage';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class ProductInventoryRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name.
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductInventory';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ class ProductRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Product\Contracts\Product::class;
|
||||
return 'Webkul\Product\Contracts\Product';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ class ProductReviewImageRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\ProductReviewImage';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ class ProductReviewRepository extends Repository
|
|||
/**
|
||||
* Specify Model class name
|
||||
*
|
||||
* @return mixed
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Product\Contracts\ProductReview::class;
|
||||
return 'Webkul\Product\Contracts\ProductReview';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class ProductVideoRepository extends ProductMediaRepository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return \Webkul\Product\Contracts\ProductVideo::class;
|
||||
return 'Webkul\Product\Contracts\ProductVideo';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -26,7 +26,12 @@ class SearchRepository extends Repository
|
|||
parent::__construct($container);
|
||||
}
|
||||
|
||||
function model()
|
||||
/**
|
||||
* Specify model class name.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function model(): string
|
||||
{
|
||||
return 'Webkul\Product\Contracts\Product';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace Webkul\Sales\Repositories;
|
|||
|
||||
use Illuminate\Container\Container;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\DownloadableLinkPurchased;
|
||||
use Webkul\Product\Repositories\ProductDownloadableLinkRepository;
|
||||
|
||||
class DownloadableLinkPurchasedRepository extends Repository
|
||||
|
|
@ -29,9 +28,9 @@ class DownloadableLinkPurchasedRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return DownloadableLinkPurchased::class;
|
||||
return 'Webkul\Sales\Contracts\DownloadableLinkPurchased';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace Webkul\Sales\Repositories;
|
|||
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\InvoiceItem;
|
||||
|
||||
class InvoiceItemRepository extends Repository
|
||||
{
|
||||
|
|
@ -13,9 +12,9 @@ class InvoiceItemRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return InvoiceItem::class;
|
||||
return 'Webkul\Sales\Contracts\InvoiceItem';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use Illuminate\Container\Container;
|
|||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\Invoice;
|
||||
use Webkul\Sales\Generators\InvoiceSequencer;
|
||||
|
||||
class InvoiceRepository extends Repository
|
||||
|
|
@ -37,9 +36,9 @@ class InvoiceRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return Invoice::class;
|
||||
return 'Webkul\Sales\Contracts\Invoice';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -18,9 +18,8 @@ class OrderAddressRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return OrderAddress::class;
|
||||
return 'Webkul\Sales\Contracts\OrderAddress';
|
||||
}
|
||||
}
|
||||
|
|
@ -12,8 +12,8 @@ class OrderCommentRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return OrderComment::class;
|
||||
return 'Webkul\Sales\Contracts\OrderComment';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ class OrderItemRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return OrderItem::class;
|
||||
return 'Webkul\Sales\Contracts\OrderItem';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use Illuminate\Support\Facades\DB;
|
|||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\Order;
|
||||
use Webkul\Sales\Generators\OrderSequencer;
|
||||
use Webkul\Sales\Models\Order as OrderModel;
|
||||
|
||||
|
|
@ -35,9 +34,9 @@ class OrderRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return Order::class;
|
||||
return 'Webkul\Sales\Contracts\Order';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace Webkul\Sales\Repositories;
|
||||
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\OrderTransaction;
|
||||
|
||||
/**
|
||||
* Order Transaction Repository
|
||||
|
|
@ -18,9 +17,8 @@ class OrderTransactionRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return OrderTransaction::class;
|
||||
return 'Webkul\Sales\Contracts\OrderTransaction';
|
||||
}
|
||||
}
|
||||
|
|
@ -12,9 +12,9 @@ class RefundItemRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return RefundItem::class;
|
||||
return 'Webkul\Sales\Contracts\RefundItem';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use Illuminate\Container\Container;
|
|||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\Refund;
|
||||
|
||||
class RefundRepository extends Repository
|
||||
{
|
||||
|
|
@ -35,9 +34,9 @@ class RefundRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return Refund::class;
|
||||
return 'Webkul\Sales\Contracts\Refund';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ class ShipmentItemRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
function model()
|
||||
function model(): string
|
||||
{
|
||||
return ShipmentItem::class;
|
||||
return 'Webkul\Sales\Contracts\ShipmentItem';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use Illuminate\Container\Container;
|
|||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Webkul\Core\Eloquent\Repository;
|
||||
use Webkul\Sales\Contracts\Shipment;
|
||||
use Webkul\Sales\Repositories\OrderItemRepository;
|
||||
use Webkul\Sales\Repositories\OrderRepository;
|
||||
use Webkul\Sales\Repositories\ShipmentItemRepository;
|
||||
|
|
@ -37,9 +36,9 @@ class ShipmentRepository extends Repository
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public function model()
|
||||
public function model(): string
|
||||
{
|
||||
return Shipment::class;
|
||||
return 'Webkul\Sales\Contracts\Shipment';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -10,8 +10,8 @@
|
|||
*/
|
||||
|
||||
/*!
|
||||
* Vue.js v2.6.12
|
||||
* (c) 2014-2020 Evan You
|
||||
* Vue.js v2.7.10
|
||||
* (c) 2014-2022 Evan You
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue