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

recompiled

This commit is contained in:
sanjeev 2022-09-09 10:01:41 +05:30
parent c1dd18f7bd e475245a5d
commit 3514a1d3a2
33 changed files with 74 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=3f5e669e43ad74f8b36c",
"/js/admin.js": "/js/admin.js?id=6634340c498715fb5f58",
"/css/admin.css": "/css/admin.css?id=253e4340dd4c55e09cba"
}

4
packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue
View File

@ -91,6 +91,10 @@ export default {
closed: {
icon: 'closed-icon',
message: 'Order Closed'
},
pending_payment: {
icon: 'pending-icon',
message: 'Payment Pending'
}
},

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

@ -1658,6 +1658,7 @@ return [
'canceled' => 'تم إلغاء الطلب',
'pending' => 'انتظار الطلب',
'processing' => 'معالجة الطلب',
'pending_payment' => 'في انتظار الدفع',
],
],
];

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

@ -1676,6 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1635,6 +1635,7 @@ return [
'canceled' => 'Bestellung storniert',
'pending' => 'Bestellung ausstehend',
'processing' => 'Auftragsabwicklung',
'pending_payment' => 'Ausstehende Zahlung',
],
],
];

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

@ -1676,7 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending payment' => 'Pending Payment',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1656,6 +1656,7 @@ return [
'canceled' => 'Orden cancelada',
'pending' => 'Orden pendiente',
'processing' => 'procesando orden',
'pending_payment' => 'Pago pendiente',
],
],
];

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

@ -1635,6 +1635,7 @@ return [
'canceled' => 'سفارش لغو شد',
'pending' => 'سفارش در انتظار',
'processing' => 'پردازش سفارش',
'pending_payment' => 'در انتظار پرداخت',
],
],
];

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

@ -1672,6 +1672,7 @@ return [
'canceled' => 'Tilaus peruutettu',
'pending' => 'Tilaus vireillä',
'processing' => 'Tilausta Käsitellään',
'pending_payment' => 'En attente de paiement',
],
],
];

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

@ -1676,6 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1673,6 +1673,7 @@ return [
'canceled' => 'आदेश रद्द',
'pending' => 'आदेश लम्बित',
'processing' => 'आदेश प्रसंस्करण',
'pending_payment' => 'En attente de paiement',
],
],
];

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

@ -1643,6 +1643,7 @@ return [
'canceled' => 'Ordine annullato',
'pending' => 'ordine pendente',
'processing' => "Elaborazione dell'ordine",
'pending_payment' => 'In attesa di Pagamento',
],
],
];

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

@ -1676,6 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1635,6 +1635,7 @@ return [
'canceled' => 'Bestelling geannuleerd',
'pending' => 'Order in behandeling',
'processing' => 'Orderverwerking',
'pending_payment' => 'In afwachting van betaling',
],
],
];

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

@ -1624,6 +1624,7 @@ return [
'canceled' => 'Zamówienie anulowane',
'pending' => 'Zamówienie w trakcie realizacji',
'processing' => 'przetwarzanie zamówienia',
'pending_payment' => 'oczekująca płatność',
],
],
];

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

@ -1638,6 +1638,7 @@ return [
'canceled' => 'Pedido cancelado',
'pending' => 'pedido pendente',
'processing' => 'processamento de pedido',
'pending_payment' => 'Pagamento Pendente',
],
],
];

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

@ -1676,6 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1676,6 +1676,7 @@ return [
'canceled' => 'Order Canceled',
'pending' => 'Order Pending',
'processing' => 'Order Processing',
'pending_payment' => 'Pending Payment',
],
],
];

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

@ -1633,6 +1633,7 @@ return [
'canceled' => 'Sipariş İptal Edildi',
'pending' => 'Sipariş beklemede',
'processing' => 'sipariş düzenleniyor',
'pending_payment' => 'bekleyen ödeme',
],
],
];

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

@ -1630,6 +1630,7 @@ return [
'canceled' => '订单取消',
'pending' => '订单待处理',
'processing' => '订单处理',
'pending_payment' => '待付款',
],
],
];

3
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -4,7 +4,8 @@
'canceled'=> trans('admin::app.notification.order-status-messages.canceled'),
'closed' => trans('admin::app.notification.order-status-messages.closed'),
'completed'=> trans('admin::app.notification.order-status-messages.completed'),
'processing' => trans('admin::app.notification.order-status-messages.processing')
'processing' => trans('admin::app.notification.order-status-messages.processing'),
'pending_payment' => trans('admin::app.notification.order-status-messages.pending_payment')
];
$allLocales = core()->getAllLocales()->pluck('name', 'code');
@endphp

6
packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
View File

@ -218,9 +218,9 @@
</div>
<div v-else>
<div class="control-group" :class="[errors.has('value') ? 'has-error' : '']" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
<input v-validate="matchedAttribute.type == 'price' ? 'decimal:2' : '' || matchedAttribute.type == 'decimal' ? 'decimal:2' : '' || matchedAttribute.type == 'integer' ? 'decimal:2' : '' || matchedAttribute.type == 'text' ? 'alpha_num' : ''" class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value" name="value"/>
<span class="control-error" v-if="errors.has('value')" v-text="errors.first('value')"></span>
<div class="control-group" :class="[errors.has('conditions[' + index + '][value]') ? 'has-error' : '']" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
<input v-validate="matchedAttribute.type == 'price' ? 'decimal:2' : '' || matchedAttribute.type == 'decimal' ? 'decimal:2' : '' || matchedAttribute.type == 'integer' ? 'decimal:2' : '' || matchedAttribute.type == 'text' ? 'alpha_dash' : ''" class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.conditions') }}&quot;"/>
<span class="control-error" v-if="errors.has('conditions[' + index + '][value]')" v-text="errors.first('conditions[' + index + '][value]')"></span>
</div>
<div class="control-group date" v-if="matchedAttribute.type == 'date'">

4
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -117,6 +117,10 @@
.text-center {
text-align: center;
}
.logo {
margin-left: 300px;
}
</style>
</head>

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -95,7 +95,7 @@
</span>
<span class="value">
{{ __('admin::app.notification.order-status-messages.'.strtolower($order->status_label)) }}
{{ __('admin::app.notification.order-status-messages.'.strtolower($order->status)) }}
</span>
</div>

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 vendored
View File

File diff suppressed because one or more lines are too long

6
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.10
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/
@ -33,7 +33,7 @@
*/
/*!
* jQuery JavaScript Library v3.6.0
* jQuery JavaScript Library v3.6.1
* https://jquery.com/
*
* Includes Sizzle.js
@ -43,7 +43,7 @@
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2021-03-02T17:08Z
* Date: 2022-08-26T17:52Z
*/
/*!

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -3,8 +3,8 @@
"/js/velocity-core.js": "/js/velocity-core.js?id=dcc312fe978be1aff63a33eaf7ad190c",
"/js/velocity.js": "/js/velocity.js?id=5e563e0af3ea88a56b03a4a30fad0a92",
"/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
"/js/components.js": "/js/components.js?id=f1962fbe19365543e54b0e329f86b8ff",
"/css/velocity.css": "/css/velocity.css?id=b052a38bbdda8e29ff1dee8479d69d63",
"/js/components.js": "/js/components.js?id=f60a033c9b4233754d022b4b9f156bb9",
"/css/velocity.css": "/css/velocity.css?id=1dc9d611540ff31dfa2cf8c86f5ad16a",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
"/images/Icon-Arrow-Right.svg": "/images/Icon-Arrow-Right.svg?id=e30f624f1a70197dc9ad9011b240aa8e",

1
packages/Webkul/Velocity/src/Models/VelocityMetadata.php
View File

@ -9,4 +9,5 @@ class VelocityMetadata extends Model implements VelocityMetadataContract
{
protected $table = 'velocity_meta_data';
protected $guarded = ['id'];
}

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

@ -307,6 +307,11 @@
position: sticky;
top: 70px;
div.col-12:first-child {
max-height: 420px;
height: 420px;
}
> div {
margin: 0;
padding: 0;

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

@ -297,7 +297,7 @@
background-color: $white-color !important;
box-shadow: 0 1px 0 0 #CFCFCF;
border: 1px solid rgba(0,0,0,0.12);
z-index: 0;
z-index: 1;
&:hover,
&:focus {

26
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -289,9 +289,35 @@
setTimeout(function() {
document.getElementById('product-form').submit();
}, 0);
} else {
this.activateAutoScroll();
}
});
},
activateAutoScroll: function(event) {
/**
* This is normal Element
*/
const normalElement = document.querySelector(
'.control-error:first-of-type'
);
/**
* Scroll Config
*/
const scrollConfig = {
behavior: 'smooth',
block: 'end',
inline: 'nearest',
}
if (normalElement) {
normalElement.scrollIntoView(scrollConfig);
return;
}
}
}
});