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

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

This commit is contained in:
merdan 2022-07-05 15:24:50 +05:00
parent e481d8c975 97105dadb9
commit 9e447b7584
19 changed files with 91 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
composer.lock generated
View File

@ -364,12 +364,12 @@
"source": {
"type": "git",
"url": "https://github.com/bagisto/rest-api.git",
"reference": "8f679061530ca31d85bff7fff0a19a3e4368216e"
"reference": "bca081c864e2509942d36c1bae885424e44abcfd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bagisto/rest-api/zipball/8f679061530ca31d85bff7fff0a19a3e4368216e",
"reference": "8f679061530ca31d85bff7fff0a19a3e4368216e",
"url": "https://api.github.com/repos/bagisto/rest-api/zipball/bca081c864e2509942d36c1bae885424e44abcfd",
"reference": "bca081c864e2509942d36c1bae885424e44abcfd",
"shasum": ""
},
"default-branch": true,
@ -400,7 +400,7 @@
"issues": "https://github.com/bagisto/rest-api/issues",
"source": "https://github.com/bagisto/rest-api/tree/master"
},
"time": "2022-04-07T09:23:21+00:00"
"time": "2022-06-02T11:23:15+00:00"
},
{
"name": "bagistobrasil/bagisto-product-social-share",
@ -2360,22 +2360,22 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.4.3",
"version": "7.4.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
"guzzlehttp/psr7": "^1.8.3 || ^2.1",
"guzzlehttp/psr7": "^1.9 || ^2.4",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@ -2464,7 +2464,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.3"
"source": "https://github.com/guzzle/guzzle/tree/7.4.5"
},
"funding": [
{
@ -2480,7 +2480,7 @@
"type": "tidelift"
}
],
"time": "2022-05-25T13:24:33+00:00"
"time": "2022-06-20T22:16:13+00:00"
},
{
"name": "guzzlehttp/promises",
@ -2568,16 +2568,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.2.1",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
"reference": "13388f00956b1503577598873fffb5ae994b5737"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
"reference": "13388f00956b1503577598873fffb5ae994b5737",
"shasum": ""
},
"require": {
@ -2601,7 +2601,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.4-dev"
}
},
"autoload": {
@ -2663,7 +2663,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.2.1"
"source": "https://github.com/guzzle/psr7/tree/2.4.0"
},
"funding": [
{
@ -2679,7 +2679,7 @@
"type": "tidelift"
}
],
"time": "2022-03-20T21:55:58+00:00"
"time": "2022-06-20T21:43:11+00:00"
},
{
"name": "intervention/image",

2
config/sanctum.php
View File

@ -31,7 +31,7 @@ return [
|
*/
'guard' => ['customer'],
'guard' => ['admin', 'customer'],
/*
|--------------------------------------------------------------------------

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

@ -1614,8 +1614,8 @@ return [
'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
'buy-now-button-display' => 'Allow customers to directly buy products',
'show-search-input-field' => 'Show Search Input Field',
'allow-no-of-new-product-homepage' => 'Allowed No of New Product in Homepage',
'allow-no-of-featured-product-homepage' => 'Allowed No of Featured Product in Homepage',
'allow-no-of-new-product-homepage' => 'Allowed number of New Product in Homepage',
'allow-no-of-featured-product-homepage' => 'Allowed number of Featured Product in Homepage',
'width' => 'Width',
'height' => 'Height',
'cache-small-image' => 'Small Image',

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

@ -1301,7 +1301,7 @@ return [
],
'error' => [
'go-to-home' => 'TORNA A HOME',
'go-to-home' => 'TORNA ALLA HOME',
'in-maitainace' => 'In Manutezione',
'right-back' => 'Torno subito',
@ -1312,22 +1312,22 @@ return [
'message' => 'La Pagina che stai cercando non esiste o è stata spostata. Naviga utilizzando il menu.',
],
'403' => [
'page-title' => '403 accesso negato',
'page-title' => '403 Accesso negato',
'name' => '403',
'title' => 'Accesso negato',
'message' => 'Non hai i permessi per accedere a questa pagina',
'message' => 'Non hai i permessi necessari per accedere a questa pagina',
],
'500' => [
'page-title' => '500 Errore interno del server',
'name' => '500',
'title' => 'Errore interno del server',
'message' => 'Il Server ha incontrato un errore interno.',
'message' => 'Il Server ha riscontrato un errore interno.',
],
'401' => [
'page-title' => '401 Errore non autorizzato',
'name' => '401',
'title' => 'Errore non autorizzato',
'message' => 'La richiesta non è stata applicata perchè manca di una valida autenticazione per accedere alla risorsa.',
'message' => 'La richiesta non è stata applicata perchè priva di una valida autenticazione per accedere alla risorsa.',
],
'tinymce' => [
@ -1390,8 +1390,8 @@ return [
],
'response' => [
'being-used' => 'Questo resource :name is getting used in :source',
'cannot-change' => 'Cannot change the :name.',
'being-used' => 'Questa risorsa :name é utilizzata in :source',
'cannot-change' => 'Impossibile modificare :name.',
'cannot-delete-default' => 'Non è possibile eliminare il canale di default',
'create-success' => ':name creato con successo.',
'update-success' => ':name aggiornato con successo.',
@ -1406,11 +1406,11 @@ return [
'upload-success' => ':name caricato con successo.',
'delete-category-root' => 'Non è possibile eliminare la categoria root',
'create-root-failure' => 'Una Categoria con lo stesso nome esiste già',
'cancel-success' => ':name cancellata con successo.',
'cancel-success' => ':name cancellato con successo.',
'cancel-error' => ':name non può essere cancellato.',
'already-taken' => 'Il nome :name è stato giù utilizzato.',
'already-taken' => 'Il nome :name è stato già utilizzato.',
'order-pending' => 'Non è possibile eliminare l\'account perchè alcuni Ordini sono in stato di attesa o in corso.',
'something-went-wrong' => 'Something went wrong!',
'something-went-wrong' => 'Qualcosa é andato storto!',
],
'validations' => [
@ -1500,13 +1500,13 @@ return [
'weight-unit' => 'Unità di peso',
'email-settings' => 'Impostazioni Email',
'email-sender-name' => 'Nome Mittente Email',
'email-sender-name-tip' => 'This name will be displayed in the customers inbox',
'email-sender-name-tip' => 'Questo nome verrá visualizzato nella casella del cliente',
'shop-email-from' => 'Indirizzo Email Negozio [per invio email]',
'shop-email-from-tip' => 'The email address of this channel to send emails to your customers',
'shop-email-from-tip' => 'L\'indirizzo email di questo canale per inviare email al cliente',
'admin-name' => 'Nome Admin',
'admin-name-tip' => 'This name will be displayed in all admin emails',
'admin-name-tip' => 'Questo nome verrá visualizzato in tutte le emails admin',
'admin-email' => 'Email Admin',
'admin-email-tip' => 'The email address of the admin for this channel to receive emails',
'admin-email-tip' => 'L\'indirizzo email dell\'admin per questo canale adibito alla ricezione di email',
'admin-page-limit' => 'Numero di risultati per Pagina (Admin)',
'design' => 'Design',
'admin-logo' => 'Logo Admin',
@ -1530,27 +1530,27 @@ return [
'invoice-number-generator-class' => 'Generatore di numeri di fattura',
'payment-terms' => 'Termini di pagamento',
'due-duration' => 'Durata dovuta',
'due-duration-day' => ':due-duration Giorno',
'due-duration-day' => ':due-duration giorno',
'due-duration-days' => ':due-duration giorni',
'invoice-slip-design' => 'Design della Fattura',
'logo' => 'Logo',
'default' => 'Default',
'invoice-reminders' => 'Rappels de factures',
'maximum-limit-of-reminders' => 'Limite maximale de rappels',
'interval-between-reminders' => 'Intervalle entre les rappels',
'invoice-reminders' => 'Promemoria di fatture',
'maximum-limit-of-reminders' => 'Limite mattismo di promemoria',
'interval-between-reminders' => 'Intervallo tra i promemoria',
'sandbox' => 'Sandbox',
'all-channels' => 'Tutti',
'all-locales' => 'Tutti',
'all-customer-groups' => 'tutti i Gruppi di Clienti',
'storefront' => 'Storefront',
'default-list-mode' => 'Modalità predefinita elenchiDefault List Mode',
'all-customer-groups' => 'Tutti i gruppi di clienti',
'storefront' => 'Vetrina',
'default-list-mode' => 'Modalità predefinita elenchi',
'grid' => 'Griglia',
'list' => 'Lista',
'products-per-page' => 'Prodotti Per Pagina',
'sort-by' => 'Ordina Per',
'from-z-a' => 'Da Z-A',
'from-a-z' => 'Da A-Z',
'newest-first' => 'I più nuovi prima',
'newest-first' => 'I più recenti prima',
'oldest-first' => 'I più vecchi prima',
'cheapest-first' => 'I più convenienti prima',
'expensive-first' => 'I più cari prima',
@ -1558,45 +1558,45 @@ return [
'favicon' => 'Favicon',
'seo' => 'SEO',
'rich-snippets' => 'Rich Snippets',
'products' => 'Products',
'enable' => 'Enable',
'show-weight' => 'Show Weight',
'show-categories' => 'Show Categories',
'show-images' => 'Show Images',
'show-reviews' => 'Show Reviews',
'show-ratings' => 'Show Ratings',
'show-offers' => 'Show Offers',
'show-sku' => 'Show SKU',
'categories' => 'Categories',
'show-sku' => 'Show SKU',
'show-search-input-field' => 'Show Search Input Field',
'products' => 'Prodotti',
'enable' => 'Abilita',
'show-weight' => 'Mostra peso',
'show-categories' => 'Mostra categorie',
'show-images' => 'Mostra immagini',
'show-reviews' => 'Mostra recensioni',
'show-ratings' => 'Mostra giudizi sulle recensioni',
'show-offers' => 'Mostra offerte',
'show-sku' => 'Mostra SKU',
'categories' => 'Categorie',
'show-sku' => 'Mostra SKU',
'show-search-input-field' => 'Mostra campo di ricerca',
'store-name' => 'Nome del negozio',
'vat-number' => 'Partita IVA',
'contact-number' => 'Numero di contatto',
'bank-details' => 'Coordinate bancarie',
'mailing-address' => 'Send Check to',
'instructions' => 'Instructions',
'custom-scripts' => 'Custom Scripts',
'custom-css' => 'Custom CSS',
'custom-javascript' => 'Custom Javascript',
'mailing-address' => 'Indirizzo di posta',
'instructions' => 'Istruzioni',
'custom-scripts' => 'Scripts personalizzati',
'custom-css' => 'CSS personalizzati',
'custom-javascript' => 'Javascript personalizzati',
'paypal-smart-button' => 'PayPal',
'client-id' => 'Client Id',
'client-id-info' => 'Use "sb" for testing.',
'client-id' => 'Id cliente',
'client-id-info' => 'Usa "sb" per effettuare test.',
'client-secret' => 'Client Secret',
'client-secret-info' => 'Add your secret key here',
'accepted-currencies' => 'Accepted currencies',
'accepted-currencies-info' => 'Add currency code comma seperated e.g. USD,INR,...',
'buy-now-button-display' => 'Allow customers to directly buy products',
'width' => 'Width',
'height' => 'Height',
'cache-small-image' => 'Small Image',
'cache-medium-image' => 'Medium Image',
'cache-large-image' => 'Large Image',
'generate-invoice' => 'Automatically generate the invoice after placing an order',
'client-secret-info' => 'Aggiungi la tua secret key qui',
'accepted-currencies' => 'Valute accettate',
'accepted-currencies-info' => 'Aggiungi valute separate da virgole e.g. USD,EUR,GBP,...',
'buy-now-button-display' => 'Permetti ia clienti di comprare direttamente prodotti',
'width' => 'Larghezza',
'height' => 'Altezza',
'cache-small-image' => 'Immagine piccola',
'cache-medium-image' => 'Immagine media',
'cache-large-image' => 'Immagine grande',
'generate-invoice' => 'Genera automaticamente la fattura al piazzamento dell\'ordine',
'set-invoice-status' => 'Set the invoice status after creating the invoice to',
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Record(s) found',
'generate-invoice-applicable' => 'Applicabile se la generazione automatica di fatture é abilitata',
'records-found' => 'Record(s) trovati',
],
],
@ -1606,7 +1606,7 @@ return [
'basic-configuration' => 'Configurazione di base',
'customer-configuration' => 'Configurazione del cliente',
'username' => 'Nome utente',
'password' => 'Parola d\'ordine',
'password' => 'Password',
'login-after-register' => 'Accedi dopo la registrazione',
'info-login' => 'Info: il cliente deve effettuare il login dopo la registrazione API.',
],

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

@ -44,7 +44,7 @@
notif-title="{{ __('admin::app.notification.notification-title', ['read' => 0]) }}"
get-notification-url="{{ route('admin.notification.get-notification') }}"
view-all="{{ route('admin.notification.index') }}"
order-view-url="{{ \URL::to('/') }}/admin/viewed-notifications/"
order-view-url="{{ \URL::to('/') }}/{{ config('app.admin_url')}}/viewed-notifications/"
pusher-key="{{ env('PUSHER_APP_KEY') }}"
pusher-cluster="{{ env('PUSHER_APP_CLUSTER') }}"
title="{{ __('admin::app.notification.title-plural') }}"

2
packages/Webkul/Admin/src/Resources/views/notifications/index.blade.php
View File

@ -50,7 +50,7 @@
@section('content')
<notification-list
url="{{ route('admin.notification.get-notification') }}"
order-view-url="{{ \URL::to('/') }}/admin/viewed-notifications/"
order-view-url="{{ \URL::to('/') }}/{{ config('app.admin_url')}}/viewed-notifications/"
pusher-key="{{ env('PUSHER_APP_KEY') }}"
pusher-cluster="{{ env('PUSHER_APP_CLUSTER') }}"
title=" {{ __('admin::app.notification.notification-title') }}"

2
packages/Webkul/Core/src/Config/sanctum.php
View File

@ -31,7 +31,7 @@ return [
|
*/
'guard' => ['customer'],
'guard' => ['admin', 'customer'],
/*
|--------------------------------------------------------------------------

2
packages/Webkul/Core/src/Repositories/ChannelRepository.php
View File

@ -70,8 +70,6 @@ class ChannelRepository extends Repository
{
Event::dispatch('core.channel.update.before', $id);
$channel = $this->find($id);
$channel = parent::update($data, $id, $attribute);
$channel->locales()->sync($data['locales']);

2
packages/Webkul/Product/src/Http/Controllers/ProductController.php
View File

@ -330,7 +330,7 @@ class ProductController extends Controller
return redirect()->back();
}
if (! $data['massaction-type'] == 'update') {
if ($data['massaction-type'] !== 'update') {
return redirect()->back();
}

2
packages/Webkul/Product/src/Http/Controllers/ReviewController.php
View File

@ -150,7 +150,7 @@ class ReviewController extends Controller
return redirect()->back();
}
if (! $data['massaction-type'] == 'update') {
if ($data['massaction-type'] !== 'update') {
return redirect()->back();
}

2
packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
View File

@ -192,7 +192,7 @@ class ProductFlatRepository extends Repository
$filterAttributes = $this->getProductsRelatedFilterableAttributes($category);
}
if (! count($filterAttributes) > 0) {
if (empty($filterAttributes)) {
$filterAttributes = $this->attributeRepository->getFilterAttributes();
}

4
packages/Webkul/Product/src/Type/AbstractType.php
View File

@ -513,7 +513,7 @@ abstract class AbstractType
*/
public function getFinalPrice($qty = null)
{
return round($this->getMinimalPrice($qty), 2);
return round($this->getMinimalPrice($qty), 4);
}
/**
@ -887,7 +887,7 @@ abstract class AbstractType
return $result;
}
$price = round($item->product->getTypeInstance()->getFinalPrice($item->quantity), 2);
$price = round($item->product->getTypeInstance()->getFinalPrice($item->quantity), 4);
if ($price == $item->base_price) {
return $result;

2
packages/Webkul/Shop/src/Http/Controllers/ProductController.php
View File

@ -114,7 +114,7 @@ class ProductController extends Controller
$filterAttributes = $this->productFlatRepository->getFilterAttributes($category);
}
if (! count($filterAttributes) > 0) {
if (empty($filterAttributes)) {
$filterAttributes = $attributeRepository->getFilterAttributes();
}

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/mix-manifest.json
View File

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba57f77b9a4344",
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
"/js/components.js": "/js/components.js?id=13ebf112e40292178d2386143e9d75cd",
"/css/velocity.css": "/css/velocity.css?id=ec34d72f944454aab702353cf01585f7",
"/css/velocity.css": "/css/velocity.css?id=3782152edbfd13cf86571135a2bd80b1",
"/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",

2
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -274,7 +274,7 @@ class Helper extends Review
$priceHTML = view('shop::products.price', ['product' => $product])->render();
$isProductNew = ($product->new && ! strpos($priceHTML, 'sticker sale') > 0) ? __('shop::app.products.new') : false;
$isProductNew = ($product->new && strpos($priceHTML, 'sticker sale') === false) ? __('shop::app.products.new') : false;
return [
'priceHTML' => $priceHTML,

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

@ -590,7 +590,7 @@ body::after {
}
.cd-quick-view {
top: 100px;
top: 30px;
width: 700px;
z-index: 101;
padding: 40px;

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

@ -380,7 +380,7 @@ body {
.compare-products {
.wishlist-icon {
left: 52px;
left: 30px;
right: unset;
}

4
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
View File

@ -61,8 +61,8 @@
</div>
<div class="section-content">
<div class="table">
<table>
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>