Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

This commit is contained in:
merdan 2022-02-24 17:02:34 +05:00
commit 298edeb037
21 changed files with 199 additions and 118 deletions

View File

@ -29,6 +29,15 @@ class CategoryDataGrid extends DataGrid
*/
protected $locale = 'all';
/**
* Contains the keys for which extra filters to show.
*
* @var string[]
*/
protected $extraFilters = [
'locales',
];
/**
* Create a new datagrid instance.
*

View File

@ -82,7 +82,9 @@ return [
'email-templates' => 'Email Templates',
'discount' => 'خصم',
'cms' => 'CMS',
'transactions' => 'Transactions',
'transactions' => 'المعاملات',
'mode' => 'الوضع',
'account-title' => 'حساب',
],
'acl' => [
@ -515,6 +517,16 @@ return [
'save-btn-title' => 'احفظ المنتج',
'general' => 'ألف-لمحة عامة',
'product-type' => 'نوع المنتج',
'type' => [
'simple' => 'بسيط',
'booking' => 'الحجز',
'bundle' => 'حزمة',
'downloadable' => 'للتحميل',
'grouped' => 'مجمعة',
'virtual' => 'افتراضية',
'configurable' => 'شكلي',
],
'simple' => 'بسيط',
'configurable' => 'مهيء',
'familiy' => 'الصفة الأسرة',

View File

@ -81,7 +81,9 @@ return [
'tax-rates' => 'Steuersätze',
'discount' => 'Rabatt',
'cms' => 'CMS',
'transactions' => 'Transactions',
'transactions' => 'Transacties',
'mode' => 'modus',
'account-title' => 'Rekening',
],
'acl' =>
[
@ -509,6 +511,16 @@ return [
'save-btn-title' => 'Produkt speichern',
'general' => 'Allgemein',
'product-type' => 'Produkttyp',
'type' => [
'simple' => 'eenvoudig',
'booking' => 'boeken',
'bundle' => 'bundel',
'downloadable' => 'downloadbaar',
'grouped' => 'gegroepeerd',
'virtual' => 'virtueel',
'configurable' => 'configureerbaar',
],
'simple' => 'Einfach',
'configurable' => 'Konfigurierbar',
'familiy' => 'Attributgruppe',

View File

@ -527,8 +527,16 @@ return [
'save-btn-title' => 'Save Product',
'general' => 'General',
'product-type' => 'Product Type',
'simple' => 'Simple',
'configurable' => 'Configurable',
'type' => [
'simple' => 'Simple',
'booking' => 'Booking',
'bundle' => 'Bundle',
'downloadable' => 'Downloadable',
'grouped' => 'Grouped',
'virtual' => 'Virtual',
'configurable' => 'Configurable',
],
'familiy' => 'Attribute Family',
'sku' => 'SKU',
'configurable-attributes' => 'Configurable Attributes',

View File

@ -83,7 +83,9 @@ return [
'events' => 'Eventos',
'discount' => 'Descuento',
'cms' => 'CMS',
'transactions' => 'Transacciones',
'transactions' => 'Transakcioj',
'mode' => 'Reĝimo',
'account-title' => 'Konto',
],
'acl' => [
@ -525,6 +527,16 @@ return [
'save-btn-title' => 'Guardar producto',
'general' => 'General',
'product-type' => 'Tipo de producto',
'type' => [
'simple' => 'simpla',
'booking' => 'mendo',
'bundle' => 'pakaĵo',
'downloadable' => 'elŝutebla',
'grouped' => 'grupigitaj',
'virtual' => 'virtuala',
'configurable' => 'agordebla',
],
'simple' => 'Simple',
'configurable' => 'Configurable',
'familiy' => 'Familia de atributos',

View File

@ -84,6 +84,8 @@ return [
'cms' => 'CMS',
'transactions' => 'Transactions',
'newsletter-subscriptions' => 'Abonnement à la Newsletter',
'mode' => 'mode',
'account-title' => 'Compte',
],
'acl' => [
@ -524,6 +526,16 @@ return [
'save-btn-title' => 'Enregistrer le produit',
'general' => 'Général',
'product-type' => 'type de produit',
'type' => [
'simple' => 'Facile',
'booking' => 'réservation',
'bundle' => 'empaqueter',
'downloadable' => 'téléchargeable',
'grouped' => 'groupé',
'virtual' => 'virtuelle',
'configurable' => 'configurable',
],
'simple' => 'Simple',
'configurable' => 'Configurable',
'familiy' => 'Famille d\'attributs',

View File

@ -82,6 +82,8 @@ return [
'discount' => 'Korting',
'cms' => 'CMS',
'transactions' => 'Transacties',
'mode' => 'modus',
'account-title' => 'Rekening',
],
'acl' => [

View File

@ -79,7 +79,9 @@ return [
'email-templates' => 'Email Templates',
'discount' => 'İndirim',
'cms' => 'CMS',
'transactions' => 'Transactions',
'transactions' => 'işlemler',
'mode' => 'mod',
'account-title' => 'Hesap',
],
'acl' => [
@ -512,6 +514,16 @@ return [
'save-btn-title' => 'Ürün Kaydet',
'general' => 'Geneş',
'product-type' => 'Ürün Tipi',
'type' => [
'simple' => 'basit',
'booking' => 'rezervasyon',
'bundle' => 'demet',
'downloadable' => 'indirilebilir',
'grouped' => 'gruplandırılmış',
'virtual' => 'gerçek',
'configurable' => 'yapılandırılabilir',
],
'simple' => 'Basit',
'configurable' => 'Ayarlanabilir',
'familiy' => 'Nitelik Grubu',

View File

@ -12,28 +12,7 @@
<div class="content">
<div class="page-header">
<div class="page-title">
<h1>{{ __('admin::app.catalog.categories.title') }}</h1>
<div class="control-group">
<select
class="control"
id="locale-switcher"
name="locale"
onchange="reloadPage('locale', this.value)"
>
<option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
{{ __('admin::app.admin.system.all-locales') }}
</option>
@foreach (core()->getAllLocales() as $localeModel)
<option
value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}
>
{{ $localeModel->name }}
</option>
@endforeach
</select>
</div>
<h1>{{ __('admin::app.catalog.categories.title') }}</h1>
</div>
<div class="page-action">

View File

@ -57,9 +57,10 @@
<select class="control" v-validate="'required'" id="type" name="type" {{ $familyId ? 'disabled' : '' }} data-vv-as="&quot;{{ __('admin::app.catalog.products.product-type') }}&quot;">
@foreach($productTypes as $key => $productType)
<option value="{{ $key }}" {{ request()->input('type') == $productType['key'] ? 'selected' : '' }}>
{{ $productType['name'] }}
</option>
@endforeach
{{ __('admin::app.catalog.products.type.'.strtolower($productType['name'])) }}
</option>
@endforeach
</select>
@if ($familyId)

View File

@ -6,11 +6,11 @@
}
.has-control-group .control-group:first-child {
padding-right: 10px;
padding-right: 0px !important;
}
.has-control-group .control-group:last-child {
padding-left: 10px;
padding-left: 0px !important;
}
.slot-list table tbody tr td .control-group label{
@ -20,8 +20,8 @@
@media only screen and (max-width: 540px){
.slot-list table thead{
display: none;
}
}
.slot-list table tbody tr td{
display: block;
}
@ -31,10 +31,9 @@
}
.table .control-group.date:after, .table .control-group.datetime:after {
top: 24px;
left: 100%;
}
}
}
</style>
@endpush

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=944a9430215bab88307c",
"/css/ui.css": "/css/ui.css?id=57354f5eea4eb6f616e9"
"/js/ui.js": "/js/ui.js?id=954073df9737f44117ed",
"/css/ui.css": "/css/ui.css?id=b332f81c084cbee9f047"
}

View File

@ -1,11 +1,11 @@
/* main imports */
@import "main/icons";
@import "main/variables";
@import "main/mixins";
@import 'main/icons';
@import 'main/variables';
@import 'main/mixins';
/* includes */
@import "includes/animations";
@import "includes/components";
@import 'includes/animations';
@import 'includes/components';
/* start from here */
* {
@ -195,8 +195,10 @@ h5 {
}
.btn {
@include box-shadow(0 1px 4px 0 rgba(0, 0, 0, 0.2),
0 0 8px 0 rgba(0, 0, 0, 0.1));
@include box-shadow(
0 1px 4px 0 rgba(0, 0, 0, 0.2),
0 0 8px 0 rgba(0, 0, 0, 0.1)
);
@include border-radius(3px);
border: none;
color: $white-color;
@ -245,9 +247,9 @@ h5 {
}
&:disabled,
&[disabled="disabled"],
&[disabled="disabled"]:hover,
&[disabled="disabled"]:active {
&[disabled='disabled'],
&[disabled='disabled']:hover,
&[disabled='disabled']:active {
cursor: not-allowed;
background: #b1b1ae;
box-shadow: none;
@ -292,8 +294,10 @@ h5 {
.dropdown-list {
width: 200px;
margin-bottom: 20px;
@include box-shadow(0 2px 4px 0 rgba(0, 0, 0, 0.16),
0 0 9px 0 rgba(0, 0, 0, 0.16));
@include box-shadow(
0 2px 4px 0 rgba(0, 0, 0, 0.16),
0 0 9px 0 rgba(0, 0, 0, 0.16)
);
@include border-radius(3px);
background-color: $white-color;
position: absolute;
@ -397,12 +401,13 @@ h5 {
}
}
.notification {
width: 400px;
margin-bottom: 20px;
@include box-shadow(0 2px 4px 0 rgba(0, 0, 0, 0.16),
0 0 9px 0 rgba(0, 0, 0, 0.16));
@include box-shadow(
0 2px 4px 0 rgba(0, 0, 0, 0.16),
0 0 9px 0 rgba(0, 0, 0, 0.16)
);
@include border-radius(3px);
background-color: $white-color;
position: absolute;
@ -452,12 +457,12 @@ h5 {
.read {
color: rgba(58, 58, 58, 0.5);
.notif-content>a {
.notif-content > a {
text-decoration: none;
color: rgba(58, 58, 58, 0.5);
&:hover {
color: rgba(58, 58, 58, 0.5)
color: rgba(58, 58, 58, 0.5);
}
}
}
@ -511,7 +516,6 @@ h5 {
}
}
.section {
.secton-title {
font-size: 18px;
@ -585,7 +589,6 @@ h5 {
vertical-align: top;
&.actions {
.action {
display: inline-flex;
}
@ -664,7 +667,7 @@ h5 {
}
.checkbox-view {
background-image: url("../images/Checkbox.svg");
background-image: url('../images/Checkbox.svg');
height: 24px;
width: 24px;
margin: 0;
@ -673,11 +676,11 @@ h5 {
margin-right: 5px;
}
input:checked+.checkbox-view {
background-image: url("../images/Checkbox-Checked.svg");
input:checked + .checkbox-view {
background-image: url('../images/Checkbox-Checked.svg');
}
input:disabled+.checkbox-view {
input:disabled + .checkbox-view {
opacity: 0.5;
cursor: not-allowed;
}
@ -697,7 +700,7 @@ h5 {
}
.radio-view {
background-image: url("../images/controls.svg");
background-image: url('../images/controls.svg');
background-position: -21px 0px;
height: 20px;
width: 20px;
@ -707,11 +710,11 @@ h5 {
margin-right: 5px;
}
input:checked+.radio-view {
input:checked + .radio-view {
background-position: -21px -21px;
}
input:disabled+.radio-view {
input:disabled + .radio-view {
opacity: 0.5;
cursor: not-allowed;
}
@ -740,7 +743,7 @@ h5 {
color: $font-color;
&.required::after {
content: "*";
content: '*';
color: $danger-color;
font-weight: 700;
display: inline-block;
@ -770,7 +773,7 @@ h5 {
border-color: $brand-color;
}
&[disabled="disabled"] {
&[disabled='disabled'] {
border-color: #d3d3d3;
background-color: #d3d3d3;
cursor: not-allowed;
@ -788,7 +791,7 @@ h5 {
}
&::after {
background-image: url("../images/Icon-Calendar.svg");
background-image: url('../images/Icon-Calendar.svg');
width: 24px;
height: 24px;
content: '';
@ -817,7 +820,7 @@ h5 {
.control-info {
display: block;
font-size: 14px;
color: #6F6F6F;
color: #6f6f6f;
font-style: italic;
}
@ -854,7 +857,6 @@ h5 {
.table {
.control-group {
&.date,
&.datetime {
&::after {
@ -865,7 +867,6 @@ h5 {
&.has-error.date,
&.has-error.date {
&.date,
&.datetime {
&::after {
@ -878,7 +879,6 @@ h5 {
.rtl {
.control-group {
&.date,
&.datetime {
.control {
@ -900,12 +900,12 @@ h5 {
.table {
.control-group {
&.date,
&.datetime {
&::after {
right: unset !important;
left: auto;
top: 6px;
}
}
}
@ -936,31 +936,31 @@ h5 {
right: 0;
bottom: 0;
background-color: $filter-toggle-color;
-webkit-transition: .2s;
transition: .2s;
-webkit-transition: 0.2s;
transition: 0.2s;
}
.slider:before {
position: absolute;
content: "";
content: '';
height: 26px;
width: 26px;
left: 4px;
bottom: 4px;
background-color: $white-color;
-webkit-transition: .2s;
transition: .2s;
-webkit-transition: 0.2s;
transition: 0.2s;
}
input:checked+.slider {
input:checked + .slider {
background-color: $brand-color;
}
input:focus+.slider {
input:focus + .slider {
box-shadow: 0 0 1px $brand-color;
}
input:checked+.slider:before {
input:checked + .slider:before {
-webkit-transform: translateX(26px);
-ms-transform: translateX(26px);
transform: translateX(26px);
@ -994,8 +994,10 @@ h5 {
padding: 15px;
@include border-radius(3px);
display: inline-block;
@include box-shadow(0px 4px 15.36px 0.64px rgba(0, 0, 0, 0.1),
0px 2px 6px 0px rgba(0, 0, 0, 0.12));
@include box-shadow(
0px 4px 15.36px 0.64px rgba(0, 0, 0, 0.1),
0px 2px 6px 0px rgba(0, 0, 0, 0.12)
);
position: relative;
animation: jelly 0.5s ease-in-out;
transform-origin: center top;
@ -1063,7 +1065,7 @@ accordian {
width: 100%;
.accordian-header,
div[slot*="header"] {
div[slot*='header'] {
width: 100%;
display: inline-block;
font-size: 18px;
@ -1075,7 +1077,7 @@ accordian {
margin-top: -1px;
.expand-icon {
background-image: url("../images/Expand-Light.svg");
background-image: url('../images/Expand-Light.svg');
margin-right: 10px;
margin-top: 3px;
}
@ -1103,19 +1105,19 @@ accordian {
}
.accordian-content,
div[slot*="body"] {
div[slot*='body'] {
width: 100%;
padding: 20px 15px;
display: none;
transition: 0.3s ease all;
}
&.active>.accordian-content {
&.active > .accordian-content {
display: inline-block;
}
&.active>.accordian-header .expand-icon {
background-image: url("../images/Expand-Light-On.svg");
&.active > .accordian-header .expand-icon {
background-image: url('../images/Expand-Light-On.svg');
}
}
@ -1126,11 +1128,11 @@ accordian {
margin-top: 10px;
width: 100%;
>.tree-item {
> .tree-item {
display: none;
}
&.active>.tree-item {
&.active > .tree-item {
display: inline-block;
}
@ -1148,7 +1150,7 @@ accordian {
display: inline-block;
margin-right: 10px;
cursor: pointer;
background-image: url("../images/Expand-Light.svg");
background-image: url('../images/Expand-Light.svg');
width: 18px;
height: 18px;
vertical-align: middle;
@ -1160,13 +1162,13 @@ accordian {
}
&.active {
>.expand-icon {
background-image: url("../images/Expand-Light-On.svg");
> .expand-icon {
background-image: url('../images/Expand-Light-On.svg');
}
}
}
>.tree-item {
> .tree-item {
padding-left: 0;
}
}
@ -1215,8 +1217,10 @@ modal {
margin-left: -300px;
position: fixed;
z-index: 11;
@include box-shadow(0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2));
@include box-shadow(
0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2)
);
animation: fade-in-white 0.3s ease-in-out;
animation: jelly 0.5s ease-in-out;
@include border-radius(5px);
@ -1262,11 +1266,18 @@ modal {
.control {
width: 100%;
}
&.date,
&.datetime {
.control {
padding-left: 40px;
}
}
}
}
.label {
background: #E7E7E7;
background: #e7e7e7;
@include border-radius(2px);
padding: 8px;
color: $black-color-shade;
@ -1339,11 +1350,11 @@ modal {
width: 200px;
height: 200px;
margin-right: 20px;
background: #F8F9FA;
background: #f8f9fa;
@include border-radius(3px);
display: inline-block;
position: relative;
background-image: url("../images/placeholder-icon.svg");
background-image: url('../images/placeholder-icon.svg');
background-repeat: no-repeat;
background-position: center;
margin-bottom: 20px;
@ -1359,7 +1370,11 @@ modal {
}
.remove-image {
background-image: linear-gradient(-180deg, rgba(0, 0, 0, 0.08) 0%, rgba(0, 0, 0, 0.24) 100%);
background-image: linear-gradient(
-180deg,
rgba(0, 0, 0, 0.08) 0%,
rgba(0, 0, 0, 0.24) 100%
);
@include border-radius(0 0 4px 4px);
position: absolute;
bottom: 0;
@ -1386,7 +1401,6 @@ modal {
border: 1px solid #d3d3d3;
}
.helper-container {
display: block;
@ -1427,7 +1441,7 @@ modal {
z-index: 1;
}
&[x-placement^="top"] {
&[x-placement^='top'] {
margin-bottom: 5px;
.tooltip-arrow {
@ -1442,7 +1456,7 @@ modal {
}
}
&[x-placement^="bottom"] {
&[x-placement^='bottom'] {
margin-top: 5px;
.tooltip-arrow {
@ -1457,7 +1471,7 @@ modal {
}
}
&[x-placement^="right"] {
&[x-placement^='right'] {
margin-left: 5px;
.tooltip-arrow {
@ -1472,7 +1486,7 @@ modal {
}
}
&[x-placement^="left"] {
&[x-placement^='left'] {
margin-right: 5px;
.tooltip-arrow {
@ -1493,7 +1507,7 @@ modal {
background-image: url(../images/Icon-Calendar.svg);
width: 24px;
height: 24px;
content: "";
content: '';
display: inline-block;
vertical-align: middle;
margin-left: -34px;
@ -1542,4 +1556,4 @@ modal {
.notification {
width: 320px;
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,10 +1,10 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=839a8f4f976c7cb12580c31185296bdb",
"/js/velocity-core.js": "/js/velocity-core.js?id=8010dfb021a49555afa74bf3bf25b33e",
"/js/velocity.js": "/js/velocity.js?id=41ab97a1e8fa27ba1e09e915c792190c",
"/js/velocity.js": "/js/velocity.js?id=8467110c3c1ee5e363d02172acbf1a3f",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=4390fa88845ac905ec54dc849367c604",
"/css/velocity.css": "/css/velocity.css?id=3b5f85c69aa3aea98f82a473a90ace3e",
"/js/components.js": "/js/components.js?id=f536199f308a82f48041993dd85acdd3",
"/css/velocity.css": "/css/velocity.css?id=111d0a858bc1a53755a516bc60365027",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

View File

@ -159,6 +159,15 @@ body {
}
}
.lg-card-container {
&.list-card {
.add-to-cart-btn {
float: right;
margin-left: 20px;
}
}
}
#top {
#account {
.welcome-content {