Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/lulandia.pl
This commit is contained in:
Binary file not shown.
@@ -1,46 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Empik\Marketplace\Repository;
|
||||
|
||||
use Db;
|
||||
use DbQuery;
|
||||
use Empik\Marketplace\Utils\Utils;
|
||||
|
||||
class AttributeRepository
|
||||
{
|
||||
/** @var Db */
|
||||
protected $db;
|
||||
|
||||
/** @var int */
|
||||
protected $langId;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->db = Db::getInstance();
|
||||
$this->langId = Utils::getLangId();
|
||||
}
|
||||
|
||||
public function getAttributes($productId, $productAttributeId)
|
||||
{
|
||||
$sql = new DbQuery();
|
||||
$sql->select('al.name AS value, agl.public_name AS name');
|
||||
$sql->from('attribute_group', 'ag');
|
||||
$sql->leftJoin('attribute_group_lang', 'agl', 'agl.id_attribute_group = ag.id_attribute_group AND agl.id_lang = ' . (int)$this->langId);
|
||||
$sql->leftJoin('product_attribute', 'pa', 'pa.id_product = ' . (int)$productId . ' AND pa.id_product_attribute = ' . (int)$productAttributeId);
|
||||
$sql->leftJoin('product_attribute_combination', 'pac', 'pac.id_product_attribute = pa.id_product_attribute');
|
||||
$sql->leftJoin('attribute', 'a', 'a.id_attribute = pac.id_attribute AND ag.id_attribute_group = a.id_attribute_group');
|
||||
$sql->leftJoin('attribute_lang', 'al', 'al.id_attribute = a.id_attribute AND al.id_lang = ' . (int)$this->langId);
|
||||
$sql->orderBy('ag.id_attribute_group');
|
||||
|
||||
$result = $this->db->executeS($sql);
|
||||
|
||||
$resultGrouped = [];
|
||||
foreach ($result as $item) {
|
||||
if (!isset($resultGrouped[$item['name']]) || $item['value']) {
|
||||
$resultGrouped[$item['name']] = $item;
|
||||
}
|
||||
}
|
||||
|
||||
return (array)$resultGrouped;
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
c:\visual studio code\projekty\drmaterac.pl\modules\empikmarketplace\vendor\composer\installers\src\Composer\Installers\~syncthing~CakePHPInstaller.php.tmp
|
||||
@@ -1 +0,0 @@
|
||||
c:\visual studio code\projekty\drmaterac.pl\modules\empikmarketplace\vendor\symfony\config\Tests\Definition\~syncthing~MergeTest.php.tmp
|
||||
Binary file not shown.
@@ -1 +0,0 @@
|
||||
c:\visual studio code\projekty\drmaterac.pl\modules\empikmarketplace\vendor\symfony\dependency-injection\Tests\Compiler\~syncthing~CheckDefinitionValidityPassTest.php.tmp
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Component2\Dir1;
|
||||
|
||||
class Service4
|
||||
{
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||
|
||||
use App\BarService;
|
||||
|
||||
return function (ContainerConfigurator $c) {
|
||||
$c->services()
|
||||
->set('bar', 'Class1')
|
||||
->set(BarService::class)
|
||||
->abstract(true)
|
||||
->lazy()
|
||||
->set('foo')
|
||||
->parent(BarService::class)
|
||||
->decorate('bar', 'b', 1)
|
||||
->args([ref('b')])
|
||||
->class('Class2')
|
||||
->file('file.php')
|
||||
->parent('bar')
|
||||
->parent(BarService::class)
|
||||
;
|
||||
};
|
||||
Binary file not shown.
@@ -1 +0,0 @@
|
||||
c:\visual studio code\projekty\drmaterac.pl\modules\empikmarketplace\vendor\symfony\dependency-injection\Tests\Fixtures\xml\~syncthing~services_deprecated.xml.tmp
|
||||
@@ -14,11 +14,17 @@
|
||||
<span class="notification-title"><i class="material-icons"></i></span>
|
||||
*}
|
||||
<strong class="noti product-name"></strong>
|
||||
<span class="noti noti-update">{l s='The product has been updated in your shopping cart' mod='leofeature'}</span>
|
||||
<span class="noti noti-delete">{l s='The product has been removed from your shopping cart' mod='leofeature'}</span>
|
||||
<span class="noti noti-add"><strong class="noti-special"></strong> {l s='Product successfully added to your shopping cart' mod='leofeature'}</span>
|
||||
<span
|
||||
class="noti noti-update">{l s='The product has been updated in your shopping cart' mod='leofeature'}</span>
|
||||
<span
|
||||
class="noti noti-delete">{l s='The product has been removed from your shopping cart' mod='leofeature'}</span>
|
||||
<span class="noti noti-add">
|
||||
<strong class="noti-special"></strong>
|
||||
<br />
|
||||
{l s='Product successfully added to your shopping cart' mod='leofeature'}
|
||||
</span>
|
||||
<span class="notification-close">X</span>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -28,13 +34,14 @@
|
||||
{*
|
||||
<span class="notification-title"><i class="material-icons"></i></span>
|
||||
*}
|
||||
|
||||
|
||||
<span class="noti noti-update">{l s='Error updating' mod='leofeature'}</span>
|
||||
<span class="noti noti-delete">{l s='Error deleting' mod='leofeature'}</span>
|
||||
<span class="noti noti-add">{l s='Error adding. Please go to product detail page and try again' mod='leofeature'}</span>
|
||||
|
||||
<span
|
||||
class="noti noti-add">{l s='Error adding. Please go to product detail page and try again' mod='leofeature'}</span>
|
||||
|
||||
<span class="notification-close">X</span>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -44,11 +51,12 @@
|
||||
{*
|
||||
<span class="notification-title"><i class="material-icons"></i></span>
|
||||
*}
|
||||
<span class="noti noti-min">{l s='The minimum purchase order quantity for the product is' mod='leofeature'} <strong class="noti-special"></strong></span>
|
||||
<span class="noti noti-min">{l s='The minimum purchase order quantity for the product is' mod='leofeature'}
|
||||
<strong class="noti-special"></strong></span>
|
||||
<span class="noti noti-max">{l s='There are not enough products in stock' mod='leofeature'}</span>
|
||||
|
||||
|
||||
<span class="notification-close">X</span>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -59,9 +67,9 @@
|
||||
<span class="notification-title"><i class="material-icons"></i></span>
|
||||
*}
|
||||
<span class="noti noti-check">{l s='You must enter a quantity' mod='leofeature'}</span>
|
||||
|
||||
|
||||
<span class="notification-close">X</span>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 71 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1917,12 +1917,12 @@ html[lang='pl'] .ApColumn .block.day_hit::after {
|
||||
.slick-list:hover + .slick-arrows .slick-prev,
|
||||
.slick-arrows .slick-next.slick-disabled:hover,
|
||||
.slick-arrows .slick-prev.slick-disabled:hover {
|
||||
background-color: rgba(52, 214, 173, 0.5);
|
||||
background-color: rgba($cLavender, 0.5);
|
||||
}
|
||||
|
||||
.slick-arrows .slick-next:hover,
|
||||
.slick-arrows .slick-prev:hover {
|
||||
background-color: rgba(52, 214, 173, 1);
|
||||
background-color: rgba($cLavender, 1);
|
||||
}
|
||||
|
||||
.product-add-to-cart {
|
||||
@@ -5718,3 +5718,9 @@ body {
|
||||
.last-bastion {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.card > .checkout {
|
||||
.btn.btn-primary {
|
||||
text-wrap: auto;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,17 +30,28 @@
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<span class="product-name">{$product.name}</span>
|
||||
<span class="product-quantity">x{$product.quantity}</span>
|
||||
<span class="product-price float-xs-right">{$product.price}</span>
|
||||
{* <span class="product-quantity">x{$product.quantity}</span> *}
|
||||
{* <span class="product-price float-xs-right">{$product.price}</span> *}
|
||||
|
||||
<div class="product-line-info product-line-info-secondary text-muted">
|
||||
<span class="label">ILOŚĆ:</span>
|
||||
<span class="value"><strong>{$product.quantity}</strong></span>
|
||||
</div>
|
||||
|
||||
<div class="product-line-info product-line-info-secondary text-muted">
|
||||
<span class="label">CENA POJEDYNCZA:</span>
|
||||
<span class="value"><strong>{$product.price}</strong></span>
|
||||
</div>
|
||||
|
||||
{hook h='displayProductPriceBlock' product=$product type="unit_price"}
|
||||
{foreach from=$product.attributes key="attribute" item="value"}
|
||||
{if $attribute != ''}
|
||||
{if $attribute != ''}
|
||||
<div class="product-line-info product-line-info-secondary text-muted">
|
||||
<span class="label">{$attribute}:</span>
|
||||
<span class="value">{$value}</span>
|
||||
<span class="label">{$attribute}:</span>
|
||||
<span class="value"><strong>{$value}</strong></span>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{/foreach}
|
||||
<br/>
|
||||
<br />
|
||||
</div>
|
||||
{/block}
|
||||
{/block}
|
||||
@@ -41,13 +41,15 @@
|
||||
<div class="col-sm-4 col-xs-9 details">
|
||||
{if $add_product_link}<a href="{$product.url}" target="_blank">{/if}
|
||||
<span>{$product.name}</span>
|
||||
{if $add_product_link}</a>{/if}
|
||||
{if $add_product_link}</a>{/if}
|
||||
{if is_array($product.customizations) && $product.customizations|count}
|
||||
{foreach from=$product.customizations item="customization"}
|
||||
<div class="customizations">
|
||||
<a href="#" data-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
|
||||
<a href="#" data-toggle="modal"
|
||||
data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
|
||||
</div>
|
||||
<div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}"
|
||||
tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
@@ -104,12 +106,12 @@
|
||||
</tr>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{if $subtotals.tax.label !== null}
|
||||
{* {if $subtotals.tax.label !== null}
|
||||
<tr class="sub" style="display:none">
|
||||
<td>{$subtotals.tax.label}</td>
|
||||
<td>{$subtotals.tax.value}</td>
|
||||
</tr>
|
||||
{/if}
|
||||
{/if} *}
|
||||
<tr class="font-weight-bold">
|
||||
<td><span class="text-uppercase">{$totals.total.label}</span> {$labels.tax_short}</td>
|
||||
<td>{$totals.total.value}</td>
|
||||
@@ -118,4 +120,4 @@
|
||||
{/block}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user