merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved commit

This commit is contained in:
Abhishek Kathuria 2022-08-24 17:04:43 +05:30
parent 17678382ee 596b9dcfc6
commit ba10d0a95f
33 changed files with 106 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
View File

@ -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();
}
}

1
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -741,6 +741,7 @@ return [
'no' => 'لا.',
'delete' => 'احذف',
'enable-atleast-one-shipping' => 'تفعيل طريقة شحن واحدة على الأقل.',
'enable-atleast-one-payment' => 'تفعيل طريقة دفع واحدة على الأقل.',
'tax-categories' => [
'title' => 'فئات الضرائب',

1
packages/Webkul/Admin/src/Resources/lang/ben/app.php
View File

@ -747,6 +747,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',

2
packages/Webkul/Admin/src/Resources/lang/de/app.php
View File

@ -733,6 +733,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',

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -747,6 +747,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',

1
packages/Webkul/Admin/src/Resources/lang/es/app.php
View File

@ -743,6 +743,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',

1
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -726,6 +726,7 @@ return [
'no' => 'خیر',
'delete' => 'حذف',
'enable-atleast-one-shipping' => 'حداقل یک روش حمل و نقل را فعال کنید.',
'enable-atleast-one-payment' => 'حداقل یک روش پرداخت را فعال کنید.',
'tax-categories' => [
'title' => 'دسته بندی های مالیات',

1
packages/Webkul/Admin/src/Resources/lang/fr/app.php
View File

@ -746,6 +746,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',

1
packages/Webkul/Admin/src/Resources/lang/he/app.php
View File

@ -747,6 +747,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',

1
packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
View File

@ -744,6 +744,7 @@ return [
'no' => 'नहीं',
'delete' => 'हटाएं',
'enable-atleast-one-shipping' => 'कम से कम एक शिपिंग विधि सक्षम करें।',
'enable-atleast-one-payment' => 'कम से कम एक भुगतान विधि सक्षम करें।',
'tax-categories' => [
'title' => 'कर श्रेणियाँ',

1
packages/Webkul/Admin/src/Resources/lang/it/app.php
View File

@ -731,6 +731,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',

1
packages/Webkul/Admin/src/Resources/lang/ja/app.php
View File

@ -747,6 +747,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',

1
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -725,6 +725,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',

1
packages/Webkul/Admin/src/Resources/lang/pl/app.php
View File

@ -726,6 +726,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',

1
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -724,6 +724,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',

1
packages/Webkul/Admin/src/Resources/lang/ru/app.php
View File

@ -747,6 +747,7 @@ return [
'no' => 'No',
'delete' => 'Delete',
'enable-atleast-one-shipping' => 'Включите хотя бы один способ доставки.',
'enable-atleast-one-payment' => 'Включите хотя бы один способ оплаты.',
'tax-categories' => [
'title' => 'Tax Categories',

1
packages/Webkul/Admin/src/Resources/lang/sin/app.php
View File

@ -747,6 +747,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',

1
packages/Webkul/Admin/src/Resources/lang/tr/app.php
View File

@ -731,6 +731,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',

1
packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
View File

@ -726,6 +726,7 @@ return [
'no' => 'No',
'delete' => '删除',
'enable-atleast-one-shipping' => '啟用至少一種運輸方式',
'enable-atleast-one-payment' => '啟用至少一種付款方式。',
'tax-categories' => [
'title' => '税分类',

2
packages/Webkul/Core/src/Resources/views/blade/tracer/style.blade.php
View File

@ -30,6 +30,8 @@
.main-container-wrapper .product-card .product-image img {
max-width: 100%;
height: 260px;
object-fit: cover;
}
</style>

3
packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
View File

@ -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);
}
}

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=934e73015300b1ae35f5",
"/js/ui.js": "/js/ui.js?id=2effb6ad469c2b8c5af2",
"/css/ui.css": "/css/ui.css?id=933372010d246f94f931"
}

2
packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/datagrid-plus.vue
View File

@ -406,7 +406,7 @@ export default {
},
searchData($event) {
const searchValue = $event.data.searchValue;
const searchValue = $event.data.searchValue.trim();
this.formURL(
'search',

8
packages/Webkul/Ui/src/Resources/assets/js/components/datagrid/filters/column-filter.vue
View File

@ -395,7 +395,7 @@ export default {
number: {
isSelected: false,
condition: null,
value: 0
value: null
},
boolean: {
@ -540,6 +540,10 @@ export default {
case 'number': {
let indexConditions = true;
if (! this.types.number.value) {
this.switchSelectCondition('number');
}
if (
this.filterIndex === this.columnOrAlias &&
(this.types.number.value === 0 ||
@ -548,8 +552,6 @@ export default {
indexConditions = false;
alert(this.translations.zeroIndex);
} else {
alert(this.translations.emptyValue);
}
if (indexConditions) {

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/components.js.LICENSE.txt
View File

@ -16,7 +16,7 @@
*/
/*!
* Vue.js v2.7.8
* Vue.js v2.7.3
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/

33
packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss vendored
View File

@ -87,17 +87,28 @@
}
}
#date-of-birth:after{
background-image: url(../images/icon-calendar.svg);
width: 24px;
height: 24px;
content: "";
display: inline-block;
vertical-align: middle;
margin-left: -34px;
pointer-events: none;
position: absolute;
top: 14%;
#date-of-birth {
display: block;
position: relative;
.cross-icon {
position: absolute;
right: 34px;
top: 8px;
}
&::after {
background-image: url(../images/icon-calendar.svg);
width: 24px;
height: 24px;
content: "";
display: inline-block;
vertical-align: middle;
pointer-events: none;
position: absolute;
top: 5px;
right: 8px;
}
}
.rtl{

1
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -777,6 +777,7 @@
.rango-delete {
margin-left: -2px;
float: left;
}
}
}

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss vendored
View File

@ -639,6 +639,10 @@ body::after {
.product-actions {
display: inline-block;
form {
float: right;
}
.compare-icon,
.wishlist-icon {
height: 38px;

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -260,6 +260,10 @@
float: left;
}
form {
float: right;
}
.compare-icon,
.wishlist-icon {
height: 46px;

30
packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss vendored
View File

@ -178,6 +178,14 @@ body {
float: right;
margin-left: 20px;
}
.wishlist-icon {
padding: 0px !important;
}
.product-information {
margin-right: 1%;
}
}
}
@ -340,6 +348,10 @@ body {
float: left;
}
form {
float: left;
}
.wishlist-icon {
float: left;
}
@ -574,16 +586,16 @@ body {
}
}
.d-inline-block {
.material-icons {
float: right !important;
margin-left: 4px !important;
#date-of-birth {
.cross-icon {
right: unset;
left: 34px;
}
&:after {
right: unset;
left: 8px;
}
}
.rango-delete {
float: right !important;
margin-left: 4px !important;
}
}
}

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -430,6 +430,11 @@
padding-left: 10px;
}
form {
display: inline-table;
vertical-align: bottom;
}
.product-price span:first-child, .product-price span:last-child {
font-size: 18px;
font-weight: 600;