Merge branch 'master' into tooltip_placement
This commit is contained in:
Devansh
GitHub
commit
0c748b6563
|
|
@ -20,6 +20,7 @@
|
|||
"algolia/algoliasearch-client-php": "^2.2",
|
||||
"astrotomic/laravel-translatable": "^11.0.0",
|
||||
"babenkoivan/elastic-scout-driver": "^1.1",
|
||||
"bagistobrasil/bagisto-product-social-share": "^0.1.2",
|
||||
"barryvdh/laravel-debugbar": "^3.1",
|
||||
"barryvdh/laravel-dompdf": "0.8.6",
|
||||
"doctrine/dbal": "2.9.2",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "fdf74de7a5b3178ce60852ca512a6f21",
|
||||
"content-hash": "3332479a65fc6c67057c2946a27fe95e",
|
||||
"packages": [
|
||||
{
|
||||
"name": "algolia/algoliasearch-client-php",
|
||||
|
|
@ -302,6 +302,46 @@
|
|||
],
|
||||
"time": "2020-06-22T14:14:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "bagistobrasil/bagisto-product-social-share",
|
||||
"version": "0.1.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/bagistobrasil/bagisto-product-social-share.git",
|
||||
"reference": "a81c4f29a3e79ce911a9e419cc83ccf513c0ab38"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/bagistobrasil/bagisto-product-social-share/zipball/a81c4f29a3e79ce911a9e419cc83ccf513c0ab38",
|
||||
"reference": "a81c4f29a3e79ce911a9e419cc83ccf513c0ab38",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"BagistoBrasil\\ProductSocialShare\\Providers\\ProductSocialShareProvider"
|
||||
],
|
||||
"aliases": []
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"BagistoBrasil\\ProductSocialShare\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Carlos Gartner",
|
||||
"email": "contato@carlosgartner.com.br"
|
||||
}
|
||||
],
|
||||
"time": "2020-08-04T12:36:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "barryvdh/laravel-debugbar",
|
||||
"version": "v3.3.3",
|
||||
|
|
|
|||
|
|
@ -3,10 +3,30 @@
|
|||
namespace Webkul\Admin\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\Factory as ValidationFactory;
|
||||
|
||||
class ConfigurationForm extends FormRequest
|
||||
{
|
||||
/*
|
||||
Added custom validator.
|
||||
*/
|
||||
public function __construct(ValidationFactory $validationFactory)
|
||||
{
|
||||
/* added custom comma seperated integer validator */
|
||||
$validationFactory->extend(
|
||||
'comma_seperated_integer',
|
||||
function ($attribute, $value, $parameters) {
|
||||
$pages = explode(',', $value);
|
||||
foreach($pages as $page){
|
||||
if (! is_numeric($page)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the Configuraion is authorized to make this request.
|
||||
*
|
||||
|
|
@ -26,6 +46,14 @@ class ConfigurationForm extends FormRequest
|
|||
{
|
||||
$this->rules = [];
|
||||
|
||||
if (request()->has('catalog.products.storefront.products_per_page')
|
||||
&& ! empty(request()->input('catalog.products.storefront.products_per_page'))
|
||||
) {
|
||||
$this->rules = [
|
||||
'catalog.products.storefront.products_per_page' => 'comma_seperated_integer',
|
||||
];
|
||||
}
|
||||
|
||||
if (request()->has('general.design.admin_logo.logo_image')
|
||||
&& ! request()->input('general.design.admin_logo.logo_image.delete')
|
||||
) {
|
||||
|
|
@ -54,6 +82,7 @@ class ConfigurationForm extends FormRequest
|
|||
{
|
||||
return [
|
||||
'general.design.admin_logo.logo_image.mimes' => 'Invalid file format. Use only jpeg, bmp, png, jpg.',
|
||||
'catalog.products.storefront.products_per_page.comma_seperated_integer' => 'Products Per Page are not comma seperated integer.'
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,9 @@ class Ipn
|
|||
$this->orderRepository->update(['status' => 'processing'], $this->order->id);
|
||||
|
||||
if ($this->order->canInvoice()) {
|
||||
$this->invoiceRepository->create($this->prepareInvoiceData());
|
||||
$invoice = $this->invoiceRepository->create($this->prepareInvoiceData());
|
||||
|
||||
$this->invoiceRepository->updateInvoiceState($invoice, "paid");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,15 +201,15 @@
|
|||
if (productId == "all") {
|
||||
updatedItems = [];
|
||||
this.$set(this, 'products', []);
|
||||
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('velocity::app.customer.compare.removed-all') }}' }];
|
||||
} else {
|
||||
updatedItems = existingItems.filter(item => item != productId);
|
||||
this.$set(this, 'products', this.products.filter(product => product.id != productId));
|
||||
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('velocity::app.customer.compare.removed') }}' }];
|
||||
}
|
||||
|
||||
this.setStorageValue('compared_product', updatedItems);
|
||||
|
||||
window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
|
||||
|
||||
this.$root.addFlashMessages();
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
</option>
|
||||
@foreach ($results['extraFilters']['channels'] as $channelModel)
|
||||
<option
|
||||
value="{{ $channelModel->code }}"
|
||||
{{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
|
||||
value="{{ $channelModel->id }}"
|
||||
{{ (isset($channel) && ($channelModel->id) == $channel) ? 'selected' : '' }}>
|
||||
{{ $channelModel->name }}
|
||||
</option>
|
||||
@endforeach
|
||||
|
|
@ -662,7 +662,6 @@
|
|||
} else {
|
||||
newParams = newParams + '&' + this.filters[i].column + condition + '=' + this.filters[i].val;
|
||||
}
|
||||
console.log('newParams', newParams);
|
||||
}
|
||||
|
||||
var uri = window.location.href.toString();
|
||||
|
|
@ -705,7 +704,7 @@
|
|||
case "channel":
|
||||
obj.label = "Channel";
|
||||
if ('channels' in this.extraFilters) {
|
||||
obj.prettyValue = this.extraFilters['channels'].find(channel => channel.code === obj.val).name
|
||||
obj.prettyValue = this.extraFilters['channels'].find(channel => channel.id == obj.val).name
|
||||
}
|
||||
break;
|
||||
case "locale":
|
||||
|
|
@ -734,7 +733,6 @@
|
|||
obj.label = this.columns[colIndex].label;
|
||||
|
||||
if (this.columns[colIndex].type === 'boolean') {
|
||||
console.log('obj.val', obj.val);
|
||||
if (obj.val === '1') {
|
||||
obj.val = '{{ __('ui::app.datagrid.true') }}';
|
||||
} else {
|
||||
|
|
@ -748,7 +746,6 @@
|
|||
|
||||
if (obj.column !== undefined && obj.val !== undefined) {
|
||||
this.filters.push(obj);
|
||||
console.log('pushed');
|
||||
}
|
||||
|
||||
obj = {};
|
||||
|
|
@ -757,7 +754,7 @@
|
|||
|
||||
removeFilter: function (filter) {
|
||||
for (let i in this.filters) {
|
||||
if (this.filters[i].col === filter.col
|
||||
if (this.filters[i].column === filter.column
|
||||
&& this.filters[i].cond === filter.cond
|
||||
&& this.filters[i].val === filter.val) {
|
||||
this.filters.splice(i, 1);
|
||||
|
|
@ -841,7 +838,6 @@
|
|||
captureColumn: function (id) {
|
||||
element = document.getElementById(id);
|
||||
|
||||
console.log(element.innerHTML);
|
||||
},
|
||||
|
||||
removeMassActions: function () {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -416,6 +416,7 @@
|
|||
.dropdown-filters {
|
||||
&.per-page {
|
||||
margin-top: 0;
|
||||
margin-bottom: 10px;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
|
@ -1011,6 +1012,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
#datagrid-filters.datagrid-filters {
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
#sort-by.sorter select {
|
||||
top: 2px;
|
||||
left: 25px;
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ return [
|
|||
'add-tooltip' => 'إضافة منتج لقائمة المقارنة',
|
||||
'added' => 'تمت إضافة العنصر بنجاح لمقارنة القائمة',
|
||||
'removed' => 'تمت إزالة العنصر بنجاح من قائمة المقارنة',
|
||||
'removed-all' => 'تمت إزالة كافة العناصر بنجاح من قائمة المقارنة',
|
||||
'already_added' => 'تمت إضافة العنصر بالفعل لمقارنة القائمة',
|
||||
'empty-text' => "ليس لديك أي عناصر في قائمة المقارنة الخاصة بك",
|
||||
'product_image' => 'Product Image',
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ return [
|
|||
'added' => 'Element erfolgreich zur Vergleichsliste hinzugefügt',
|
||||
'already_added' => 'Artikel bereits zur Vergleichsliste hinzugefügt',
|
||||
'removed' => 'Element erfolgreich aus Vergleichsliste entfernt',
|
||||
'removed-all' => 'Alle Elemente erfolgreich aus der Vergleichsliste entfernt',
|
||||
'empty-text' => "Sie haben keine Elemente in Ihrer Vergleichsliste",
|
||||
'product_image' => 'Produktbild',
|
||||
'actions' => 'Aktionen',
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ return [
|
|||
'added' => 'Item successfully added to compare list',
|
||||
'already_added' => 'Item already added to compare list',
|
||||
'removed' => 'Item successfully removed from compare list',
|
||||
'removed-all' => 'All Items successfully removed from compare list',
|
||||
'empty-text' => "You don't have any items in your compare list",
|
||||
'product_image' => 'Product Image',
|
||||
'actions' => 'Actions',
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ return [
|
|||
'added' => 'مورد با موفقیت برای مقایسه لیست اضافه شد',
|
||||
'already_added' => 'مورد در حال حاضر برای مقایسه لیست اضافه شده است',
|
||||
'removed' => 'مورد با موفقیت از لیست مقایسه حذف شد',
|
||||
'removed-all' => 'همه موارد با موفقیت از لیست مقایسه حذف شدند',
|
||||
'empty-text' => "شما هیچ موردی را در لیست مقایسه خود ندارید",
|
||||
'product_image' => 'Product Image',
|
||||
'actions' => 'Actions',
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ return [
|
|||
'added' => 'Articolo aggiunto alla lista di comparazione',
|
||||
'already_added' => 'Articolo già aggiunto alla lista di comparazione',
|
||||
'removed' => 'Articolo rimosso dalla lista di comparazione',
|
||||
'removed-all' => 'Tutti gli elementi rimossi correttamente dall\'elenco di confronto',
|
||||
'empty-text' => "Non hai articoli nella tua lista di comparazione",
|
||||
],
|
||||
'login-form' => [
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ return [
|
|||
'added' => 'Item successfully added to compare list',
|
||||
'already_added' => 'Item already added to compare list',
|
||||
'removed' => 'Item successfully removed from compare list',
|
||||
'removed-all' => 'Alle items zijn met succes verwijderd uit de vergelijkingslijst',
|
||||
'empty-text' => "You don't have any items in your compare list",
|
||||
'product_image' => 'Product Image',
|
||||
'actions' => 'Actions',
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ return [
|
|||
'added' => 'Produkt został pomyślnie dodany do listy porównania',
|
||||
'already_added' => 'Produkt został już dodany do listy porównawczej',
|
||||
'removed' => 'Produkt został pomyślnie usunięty z listy porównawcze',
|
||||
'removed-all' => 'Wszystkie pozycje zostały pomyślnie usunięte z listy porównawczej',
|
||||
'empty-text' => 'Nie masz żadnych pozycji na liście porównawczej',
|
||||
],
|
||||
'login-form' => [
|
||||
|
|
|
|||
|
|
@ -201,6 +201,7 @@ return [
|
|||
'already_added' => 'Item já adicionado à lista de comparação',
|
||||
'added' => 'Item adicionado com sucesso à lista de comparação',
|
||||
'removed' => 'Item removido com sucesso da lista de comparação',
|
||||
'removed-all' => 'Todos os itens removidos com sucesso da lista de comparação',
|
||||
'empty-text' => "Você não possui nenhum item na sua lista de comparação",
|
||||
'product_image' => 'Imagem do Produto',
|
||||
'actions' => 'Ações',
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ return [
|
|||
'added' => 'Ürün karşılaştırma listesine başarıyla eklendi.',
|
||||
'already_added' => 'Ürün zaten karşılaştırma listesinde yer alıyor.',
|
||||
'removed' => 'Ürün karşılaştırma listesinden başarıyla kaldırıldı.',
|
||||
'removed-all' => 'Tüm Öğeler karşılaştırma listesinden başarıyla kaldırıldı',
|
||||
'empty-text' => "Karşılaştırma listenizde henüz ürün bulunmuyor.",
|
||||
'product_image' => 'Ürün Görseli',
|
||||
'actions' => 'Eylemler',
|
||||
|
|
|
|||
Loading…
Reference in New Issue