Skip to content

I
idivbanu
Commit c806f56b by Яков
Options

test

parent c8fd5491
Showing with 870 additions and 92 deletions
apps/arm/config/routing.yml
discount_phone:
class: sfDoctrineRouteCollection
options:
model: DiscountPhone
module: discount_phone
prefix_path: /discount_phone
column: id
with_wildcard_routes: true
discount:
class: sfDoctrineRouteCollection
options:
model: Discount
module: discount
prefix_path: /discount
column: id
with_wildcard_routes: true
notification_emails: notification_emails:
class: sfDoctrineRouteCollection class: sfDoctrineRouteCollection
options: options:
......
apps/arm/modules/basket_order/templates/_form_fieldset_footer.php
<?php <?php
if (!$form->isNew()) { if (!$form->isNew()) {
$discount = Doctrine::getTable('DiscountPhone')->findOneByOrderId($form->getObject()->getId());
$offers = $form->getObject()->getOffers(); $offers = $form->getObject()->getOffers();
if (count($offers) > 0) { if (count($offers) > 0) {
?> ?>
<div class="advanced_custom"> <div class="advanced_custom">
<?php
if ($discount) {
?>
<div>Использована скидка <?php echo $discount->getDiscount()->getTitle() . ' с ' . $discount->getActiveDiscount() . '%' ?></div>
<?php
}
?>
<div class="advanced_custom__h">Товарные предложения<sup>&nbsp;<?php echo count($offers);?></sup></div> <div class="advanced_custom__h">Товарные предложения<sup>&nbsp;<?php echo count($offers);?></sup></div>
<div class="content"> <div class="content">
<table width="100%" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="0">
...@@ -17,7 +25,7 @@ if (!$form->isNew()) { ...@@ -17,7 +25,7 @@ if (!$form->isNew()) {
<?php <?php
$total = 0; $total = 0;
foreach ($offers as $offer) { foreach ($offers as $offer) {
echo '<tr align="right"><td align="left">' . $offer['Offer']['Translation']['ru']['title'] . '</td><td>' . $offer['amount'] . '</td><td>' . number_format($offer['Offer']['price'], 0, ',', ' ') . '&nbsp;₽</td><td><nobr>' . number_format($offer['price'], 0, ',', ' ') . '&nbsp;₽</nobr></td></tr>'; echo '<tr align="right"><td align="left">' . $offer['Offer']['Translation']['ru']['title'] . '</td><td>' . $offer['amount'] . '</td><td>' . number_format($offer['price']/$offer['amount'], 0, ',', ' ') . '&nbsp;₽</td><td><nobr>' . number_format($offer['price'], 0, ',', ' ') . '&nbsp;₽</nobr></td></tr>';
$total += $offer['price']; $total += $offer['price'];
} }
echo '<tr class="advanced_custom__tr_divider_top"><td align="right" colspan="4"><nobr><b>Итого:&nbsp;</b>' . number_format($total, 0, ',', ' ') . '&nbsp;₽</nobr></td></tr>'; echo '<tr class="advanced_custom__tr_divider_top"><td align="right" colspan="4"><nobr><b>Итого:&nbsp;</b>' . number_format($total, 0, ',', ' ') . '&nbsp;₽</nobr></td></tr>';
......
apps/www/config/factories.yml
...@@ -21,6 +21,7 @@ all: ...@@ -21,6 +21,7 @@ all:
class: sfSessionStorage class: sfSessionStorage
param: param:
session_name: om session_name: om
session_cookie_lifetime: 2592000
routing: routing:
class: sfPatternRouting class: sfPatternRouting
param: param:
......
apps/www/config/routing.yml
...@@ -8,6 +8,10 @@ homepage: ...@@ -8,6 +8,10 @@ homepage:
requirements: requirements:
sf_culture: (?:ru|en) sf_culture: (?:ru|en)
homepage_discount:
url: /:sf_culture/discount/:url/
param: { module: main, action: index }
search: search:
url: /:sf_culture/search/ url: /:sf_culture/search/
param: { module: search, action: search } param: { module: search, action: search }
...@@ -24,6 +28,10 @@ review: ...@@ -24,6 +28,10 @@ review:
url: /:sf_culture/review/ url: /:sf_culture/review/
param: { module: review, action: index } param: { module: review, action: index }
discount:
url: /:sf_culture/discount/
param: { module: discount, action: index }
catalog: catalog:
url: /:sf_culture/catalog/ url: /:sf_culture/catalog/
param: { module: catalog, action: index } param: { module: catalog, action: index }
...@@ -48,6 +56,10 @@ basket_complete: ...@@ -48,6 +56,10 @@ basket_complete:
url: /:sf_culture/basket/complete/ url: /:sf_culture/basket/complete/
param: { module: basket, action: complete } param: { module: basket, action: complete }
basket_check_discount:
url: /:sf_culture/basket/check_discount/
param: { module: discount, action: check_discount }
catalog_show_cat: catalog_show_cat:
url: /catalog/:alias/ url: /catalog/:alias/
param: { module: catalog, action: show_cat } param: { module: catalog, action: show_cat }
...@@ -84,6 +96,10 @@ uploader: ...@@ -84,6 +96,10 @@ uploader:
url: /uploader/ url: /uploader/
param: { module: main, action: uploader } param: { module: main, action: uploader }
check_discount_term:
url: /check_discount_term/
param: { module: discount, action: check_discount_term }
page_show: page_show:
url: /:sf_culture/:alias/ url: /:sf_culture/:alias/
class: sfDoctrineRoute class: sfDoctrineRoute
......
apps/www/config/settings.yml
...@@ -6,7 +6,7 @@ prod: ...@@ -6,7 +6,7 @@ prod:
dev: dev:
.settings: .settings:
error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?> error_reporting: <?php echo (E_ALL | E_STRICT)."\n" ?>
web_debug: false web_debug: true
cache: true cache: true
etag: false etag: false
logging_enabled: false logging_enabled: false
......
apps/www/config/view.yml
...@@ -4,18 +4,18 @@ default: ...@@ -4,18 +4,18 @@ default:
metas: metas:
robots: 'index, follow' robots: 'index, follow'
stylesheets: stylesheets:
- 'fonts.css?deploy=1519103100' - 'fonts.css?deploy=1519103092'
- 'g.css?deploy=1519103101' - 'g.css?deploy=1519103094'
- 'p.css?deploy=1519103104' - 'p.css?deploy=1519103095'
- 'a.css?deploy=1519103102' - 'a.css?deploy=1519103092'
- 'nouislider.css?deploy=1519103100' - 'nouislider.css?deploy=1519103100'
javascripts: javascripts:
- 'jquery-2.1.4.min.js?deploy=1519103100' - 'jquery-2.1.4.min.js?deploy=1519103092'
- 'jquery.plugins.js?deploy=1519103100' - 'jquery.plugins.js?deploy=1519103092'
- 'jquery.cycle2.min.js?deploy=1519103100' - 'jquery.cycle2.min.js?deploy=1519103092'
- 'jquery.cycle2.swipe.js?deploy=1519103100' - 'jquery.cycle2.swipe.js?deploy=1519103092'
- 'jquery.cycle2.carousel.min.js?deploy=1519103100' - 'jquery.cycle2.carousel.min.js'
- 'nouislider.js?deploy=1519103100' - 'nouislider.js?deploy=1519103092'
- 'init.d.js?deploy=1519103100' - 'init.d.js?deploy=1519103092'
has_layout: true has_layout: true
layout: layout layout: layout
apps/www/modules/basket/actions/actions.class.php
...@@ -344,6 +344,30 @@ class basketActions extends sfActions ...@@ -344,6 +344,30 @@ class basketActions extends sfActions
$this->order_form->bind($request->getParameter($this->order_form->getName())); $this->order_form->bind($request->getParameter($this->order_form->getName()));
if($this->order_form->isValid()){ if($this->order_form->isValid()){
$params =$request->getParameter($this->order_form->getName());
$phone = $params['phone'];
if ($this->getUser()->hasAttribute('active_discount') && $this->getUser()->getAttribute('active_discount') != false) {
$date_now = new DateTime('now');
$date_limit = new DateTime('now');
$date_limit->modify('-30 day');
$discount = Doctrine_Query::create()
->select()
->from('DiscountPhone dp')
->where('dp.phone = ?', $phone)
->andWhere('dp.order_id is null')
->andWhere('dp.created_at BETWEEN STR_TO_DATE(\'' . $date_limit->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\')
AND STR_TO_DATE(\'' . $date_now->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\')')
->execute();
if (count($discount) > 0) {
$discount = intval($discount->getFirst()->getActiveDiscount());
} else {
$discount = 0;
}
} else {
$discount = 0;
}
$order = $this->order_form->save(); $order = $this->order_form->save();
$basket->setBasketOrderId($order->getId()); $basket->setBasketOrderId($order->getId());
$basket->save(); $basket->save();
...@@ -364,22 +388,45 @@ class basketActions extends sfActions ...@@ -364,22 +388,45 @@ class basketActions extends sfActions
$products['sum'] = 0; $products['sum'] = 0;
foreach ($basket->getBasketOffer()->toArray() as $key => $basketOffer) foreach ($basket->getBasketOffer() as $key => $basketOffer)
{ {
$offerTranslation = Doctrine_Query::create() $offerTranslation = Doctrine_Query::create()
->select('o.*, t.*') ->select('o.*, t.*')
->from('Offer o') ->from('Offer o')
->where('o.id = ?', intval($basketOffer['offer_id'])) ->where('o.id = ?', intval($basketOffer->getOfferId()))
->leftJoin('o.Translation t') ->leftJoin('o.Translation t')
->fetchArray(); ->fetchArray();
if ($discount && $offerTranslation[0]['discount_available'] == 1) {
$basketOffer->setPrice($basketOffer->getPrice()/100*(100-$discount));
$basketOffer->save();
}
$products['elem'][$key]['name'] = $offerTranslation[0]['Translation']['ru']['title']; $products['elem'][$key]['name'] = $offerTranslation[0]['Translation']['ru']['title'];
$products['elem'][$key]['price'] = intval($basketOffer['price'])/$basketOffer['amount']; $products['elem'][$key]['price'] = number_format(intval($basketOffer->getPrice())/$basketOffer->getAmount(), 0, ',', ' ');
$products['elem'][$key]['count'] = $basketOffer['amount']; $products['elem'][$key]['count'] = $basketOffer->getAmount();
$products['sum'] = $products['sum'] + intval($basketOffer['price']); $products['sum'] = $products['sum'] + intval($basketOffer->getPrice());
}
$date_now = new DateTime('now');
$date_limit = new DateTime('now');
$date_limit->modify('-30 day');
$phone_discount = Doctrine_Query::create()
->select()
->from('DiscountPhone dp')
->where('dp.phone = ?', $this->getUser()->getAttribute('phone_number'))
->andWhere('dp.order_id is null')
->andWhere('dp.created_at BETWEEN STR_TO_DATE(\'' . $date_limit->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\') AND STR_TO_DATE(\'' . $date_now->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\')')
->execute();
if (count($phone_discount) > 0) {
$phone_discount = $phone_discount->getFirst();
$phone_discount->setOrderId($order->getId());
$phone_discount->save();
} }
$this->getUser()->setAttribute('active_discount', false);
$this->getUser()->setAttribute('phone', false);
$this->getUser()->setAttribute('number_of_views', false);
$emails_dirty = NotificationEmailsTable::getInstance()->createQuery('e') $emails_dirty = NotificationEmailsTable::getInstance()->createQuery('e')
->select('e.email') ->select('e.email')
...@@ -420,7 +467,6 @@ class basketActions extends sfActions ...@@ -420,7 +467,6 @@ class basketActions extends sfActions
); );
} }
$this->redirect('@basket_complete'); $this->redirect('@basket_complete');
} }
} }
......
apps/www/modules/basket/actions/components.class.php
...@@ -24,5 +24,8 @@ class basketComponents extends sfComponents ...@@ -24,5 +24,8 @@ class basketComponents extends sfComponents
if(count($this->offers) > 0){ if(count($this->offers) > 0){
$this->info = $user->getBasketInfo(); $this->info = $user->getBasketInfo();
} }
if ($this->getUser()->hasAttribute('active_discount') && $this->getUser()->getAttribute('active_discount') != false) {
$this->percent = $this->getUser()->getAttribute('active_discount');
}
} }
} }
\ No newline at end of file
apps/www/modules/basket/templates/_basket.php
...@@ -13,12 +13,15 @@ ...@@ -13,12 +13,15 @@
</thead> </thead>
<tbody valign="middle"> <tbody valign="middle">
<?php <?php
if (!isset($percent)) {
$percent = false;
}
$summ = 0;
$productFreeShipping = 1; $productFreeShipping = 1;
foreach ($offers as $offer){ foreach ($offers as $offer){
if ($offer['Product']['free_shipping'] == 0) { if ($offer['Product']['free_shipping'] == 0) {
$productFreeShipping = 0; $productFreeShipping = 0;
} }
//print_r($offer);
$quantity_type = $offer['Translation'][$culture]['quantity_type']; $quantity_type = $offer['Translation'][$culture]['quantity_type'];
if ($offer['quantity_type_select']) { if ($offer['quantity_type_select']) {
$quantity_type = (isset(Offer::$quantity_type_select_values[$offer['quantity_type_select']]) ? Offer::$quantity_type_select_values[$offer['quantity_type_select']] : ''); $quantity_type = (isset(Offer::$quantity_type_select_values[$offer['quantity_type_select']]) ? Offer::$quantity_type_select_values[$offer['quantity_type_select']] : '');
...@@ -30,7 +33,7 @@ ...@@ -30,7 +33,7 @@
$offer_img = $offer_imgs[0]; $offer_img = $offer_imgs[0];
} }
//print_r($offer['Product']); //print_r($offer['Product']);
echo '<td valign="top"><a style="border: none" href="/' . $offer['Translation'][$culture]['lang'] . '/product/' . $offer['Product']['alias'] . '/"><div class="basket_img" ' . ($offer_img ? 'style="background-image: url(/u/i/' . Page::replaceImageSize($offer_img, 'S') . ');"' : '') . '></div></a>'; echo '<td valign="top"><a style="border: none" href="/' . $offer['Translation'][$culture]['lang'] . '/product/' . $offer['Product']['alias'] . '/"><div class="basket_img ' . ($offer['discount_available'] == 1 ? 'discount' : '') . '" ' . ($offer_img ? 'style="background-image: url(/u/i/' . Page::replaceImageSize($offer_img, 'S') . ');"' : '') . '></div></a>';
echo '<td><div class="basket_offer_title"><a href="/' . $offer['Translation'][$culture]['lang'] . '/product/' . $offer['Product']['alias'] . '/">' . $offer['Translation'][$culture]['title'] . '</a></div></td>'; echo '<td><div class="basket_offer_title"><a href="/' . $offer['Translation'][$culture]['lang'] . '/product/' . $offer['Product']['alias'] . '/">' . $offer['Translation'][$culture]['title'] . '</a></div></td>';
echo '</td>'; echo '</td>';
echo '<td class="align_center"><div class="product_counter" data-id="' . $offer['id'] . '">'; echo '<td class="align_center"><div class="product_counter" data-id="' . $offer['id'] . '">';
...@@ -38,15 +41,22 @@ ...@@ -38,15 +41,22 @@
echo '<input autocomplete="off" type="text" class="product_counter_val" value="' . $offer['BasketOffer'][0]['amount'] . '" data-symbol="false" onkeyup="counterLite.update($(this))">'; echo '<input autocomplete="off" type="text" class="product_counter_val" value="' . $offer['BasketOffer'][0]['amount'] . '" data-symbol="false" onkeyup="counterLite.update($(this))">';
echo '<input type="button" class="product_counter_plus" data-symbol="+" onclick="counterLite.update($(this))">'; echo '<input type="button" class="product_counter_plus" data-symbol="+" onclick="counterLite.update($(this))">';
echo '</div><span class="name_unit">' . ($quantity_type != '' ? $quantity_type : '') . '</span></td>'; echo '</div><span class="name_unit">' . ($quantity_type != '' ? $quantity_type : '') . '</span></td>';
echo '<td valign="middle" class="basket_offers_table__price align_center">' . number_format($offer['price'], 0, ',', ' ') . '&nbsp;<span class="rub">i</span></td>'; if ($percent && $offer['discount_available'] == 1) {
echo '<td valign="middle" class="basket_offers_table__price align_center">' . number_format($offer['BasketOffer'][0]['price'], 0, ',', ' ') . '&nbsp;<span class="rub">i</span></td>'; echo '<td valign="middle" class="basket_offers_table__price align_center"><div style="position: relative"><div class="basket_discount"><span style="text-decoration: line-through">' . number_format($offer['price'], 0, ',', ' ') . '&nbsp;</span><span style="font-size: 15px" class="rub">i</span></div><div class="basket_item">' . number_format($offer['price']/100*(100-$percent), 0, ',', ' ') . '&nbsp;<span class="rub">i</span></div></div></td>';
echo '<td valign="middle" class="basket_offers_table__price align_center"><div class="basket_item"> ' . number_format($offer['BasketOffer'][0]['price']/100*(100-$percent), 0, ',', ' ') . '&nbsp;<span class="rub">i</span></div></td>';
$summ = $summ + $offer['BasketOffer'][0]['price']/100*(100-$percent);
}else {
echo '<td valign="middle" class="basket_offers_table__price align_center"><div class="basket_item">' . number_format($offer['price'], 0, ',', ' ') . '&nbsp;<span class="rub">i</span></div></td>';
echo '<td valign="middle" class="basket_offers_table__price align_center"><div class="basket_item">' . number_format($offer['BasketOffer'][0]['price'], 0, ',', ' ') . '&nbsp;<span class="rub">i</span></div></td>';
$summ = $summ + $offer['BasketOffer'][0]['price'];
}
echo '<td width="1" align="center"><div class="basket_clean" onclick="basket.delete(this);"></div></td>'; echo '<td width="1" align="center"><div class="basket_clean" onclick="basket.delete(this);"></div></td>';
echo '</tr>'; echo '</tr>';
} }
?> ?>
</tbody> </tbody>
</table> </table>
<div class="basket_total" data-delivery-info="<?php echo $productFreeShipping ?>"><?php echo __('Итого');?>:<div class="basket_total__price"><?php echo number_format($info['price'], 0, ',', ' ');?></div>&nbsp;<span class="rub">i</span></div> <div class="basket_total" data-delivery-info="<?php echo $productFreeShipping ?>"><?php echo __('Итого');?>:<div class="basket_total__price"><?php echo number_format($summ, 0, ',', ' ');?></div>&nbsp;<span class="rub">i</span></div>
</div> </div>
</div> </div>
......
apps/www/modules/basket/templates/indexSuccess.php
...@@ -42,7 +42,7 @@ echo '<h1 class="content_title">' . __('Корзина') . '</h1>'; ...@@ -42,7 +42,7 @@ echo '<h1 class="content_title">' . __('Корзина') . '</h1>';
<?php <?php
echo '<h2>' . __('Контактные данные') . ':</h2>'; echo '<h2>' . __('Контактные данные') . ':</h2>';
echo '<div class="basket_buyer__item"><input size="27" maxlength="255" required="1" placeholder="Как к вам обращаться" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="noempty" class="basket_buyer__inp_name validate_it" name="basket_order[username]" id="basket_order_username" type="text"></div>'; echo '<div class="basket_buyer__item"><input size="27" maxlength="255" required="1" placeholder="Как к вам обращаться" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="noempty" class="basket_buyer__inp_name validate_it" name="basket_order[username]" id="basket_order_username" type="text"></div>';
echo '<div class="basket_buyer__item"><input size="27" maxlength="24" required="1" placeholder="Номер телефона" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="phone" class="basket_buyer__inp_name validate_it" name="basket_order[phone]" id="basket_order_phone" type="text"></div>'; echo '<div class="basket_buyer__item"><div class="phone_info"></div><input size="27" maxlength="24" required="1" placeholder="Номер телефона" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="phone" class="basket_buyer__inp_name phone_mask validate_it" name="basket_order[phone]" id="basket_order_phone" type="text"></div>';
echo '<div class="basket_buyer__item"><input size="27" maxlength="24" required="1" placeholder="Email" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="email" class="basket_buyer__inp_name validate_it" name="basket_order[email]" id="basket_order_email" type="text"></div>'; echo '<div class="basket_buyer__item"><input size="27" maxlength="24" required="1" placeholder="Email" onchange="form_validator.check($(this))" onkeyup="form_validator.check($(this))" data-check-rule="email" class="basket_buyer__inp_name validate_it" name="basket_order[email]" id="basket_order_email" type="text"></div>';
?> ?>
</div> </div>
...@@ -86,11 +86,126 @@ echo '<h1 class="content_title">' . __('Корзина') . '</h1>'; ...@@ -86,11 +86,126 @@ echo '<h1 class="content_title">' . __('Корзина') . '</h1>';
<?php <?php
echo '<h2>' . __('Общая сумма заказа') . '</h2>'; echo '<h2>' . __('Общая сумма заказа') . '</h2>';
echo '<div class="basket_order__price">' . $info['priceText'] . '&nbsp;<span class="rub">i</span></div>'; echo '<div class="basket_order__price">' . $info['priceText'] . '&nbsp;<span class="rub">i</span></div>';
echo '<input type="submit" class="btn green_b_btn order_btn btn_disabled" value="' . __('Оформить заказ') . '" onclick="yaCounter48466937.reachGoal(\'ORDER\')" disabled>'; echo '<input type="submit" class="btn green_b_btn order_btn btn_disabled" value="' . __('Оформить заказ') . '" disabled>';
?> ?>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var lastvalue = '';
var lastvalueunmask = '';
function mask(str) {
var arr = str.split('');
if (str.length >= 2)
{
arr.splice(2,0," (");
if (str.length >= 5)
{
arr.splice(6,0,") ");
}
if (str.length >=8)
{
arr.splice(10,0,"-");
}
if (str.length >= 10)
{
arr.splice(13,0,"-");
}
}
return arr.join('');
}
function unmask(str) {
var rep = /[()\-\s]/g;
var value = str.replace(rep, '');
return value;
}
$('.phone_mask').on('input', function () {
var value = unmask($(this).val());
var last = value.slice(-1);
var first = value.charAt(0);
var rep = /(^\+7)(9)([0-9]{0,9})/g;
if ((value.length == 2) && (first == '+'))
{
if (value == '+9')
{
value = '+79';
lastvalue = '+79';
}else
{
value = '+7';
lastvalue = '+7';
}
}else
if ((value == '7') || (value == '8'))
{
value = '+7';
} else
if (value == '9')
{
value = '+79';
} else
{
var execval = rep.exec(value);
if (execval != null)
{
value = execval[0];
} else
{
if ((last != '9'))
{
value = value.substring(0, value.length - 1)
}
}
}
$(this).val(mask(value));
lastvalue = $(this).val();
lastvalueunmask = value;
});
$('.phone_mask').on('keydown', function (event) {
var key = event.keyCode || event.charCode;
if( key == 8 || key == 46 ){
var value = unmask($('.phone_mask').val());
value = value.substring(0, value.length - 1);
$('.phone_mask').val(mask(value));
lastvalue = $('.phone_mask').val();
return false;
}
});
$('.phone_mask').on('blur', function (e) {
if ($('.phone_mask').val().length == 18) {
$.ajax({
url: '/ru/basket/check_discount/',
dataType: 'json',
type: 'post',
data: {phone: $('.phone_mask').val()},
success: function (data) {
if (data.status == 'success' && data.active_discount > 0) {
$('.basket_refresh').html(data.body);
$($('.top_right')[1]).addClass('discount_basket');
$('.phone_info').html('На этом номере обнаружена скидка ' + data.active_discount + '%')
} else if (data.status == 'success' && data.active_discount == 0) {
$('.basket_refresh').html(data.body);
$($('.top_right')[1]).removeClass('discount_basket');
$('.phone_info').html('На этом номере скидка не обнаружена')
}
},
error: function (error) {
console.log(error);
}
})
}
})
$(document).ready(function () { $(document).ready(function () {
var delivery_info = $('.basket_total').data('delivery-info'); var delivery_info = $('.basket_total').data('delivery-info');
console.log(delivery_info); console.log(delivery_info);
......
apps/www/modules/catalog/actions/actions.class.php
...@@ -141,7 +141,7 @@ class catalogActions extends sfActions ...@@ -141,7 +141,7 @@ class catalogActions extends sfActions
->orderBy('p.sort asc'); ->orderBy('p.sort asc');
//->andWhere("CHAR_LENGTH(p.product_img) > 0"); //->andWhere("CHAR_LENGTH(p.product_img) > 0");
$products_q = Doctrine_Query::create() $products_q = Doctrine_Query::create()
->select("p.id, p.alias, p.product_img, p.is_detail, p.offer_count, p.is_delete, c.*, t.id, t.lang, t.title, o.id, o.product_id, o.price, o.quantity_type_select, ot.*, ppv.*") ->select("p.id, p.alias, p.product_img, p.is_detail, p.offer_count, p.is_delete, c.*, t.id, t.lang, t.title, o.id, o.product_id, o.price, o.quantity_type_select, o.discount_available, ot.*, ppv.*")
->from("Product p") ->from("Product p")
->leftJoin("p.CatProduct c") ->leftJoin("p.CatProduct c")
->leftJoin("p.Translation t") ->leftJoin("p.Translation t")
......
apps/www/modules/catalog/templates/_product_calculator.php
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<tr> <tr>
<td colspan="5"> <td colspan="5">
<i class="br40"></i> <i class="br40"></i>
<a href="" class="btn green_btn calculator_table__btn" onclick="yaCounter48466937.reachGoal('ADD');">Добавить в корзину</a> <a href="" class="btn green_btn calculator_table__btn">Добавить в корзину</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
apps/www/modules/catalog/templates/showSuccess.php
...@@ -50,3 +50,11 @@ echo '<h1 class="content_title">' . $translation[$culture]['title'] . '</h1>'; ...@@ -50,3 +50,11 @@ echo '<h1 class="content_title">' . $translation[$culture]['title'] . '</h1>';
} }
?> ?>
</div> </div>
<script>
$('.discount_available').on('click', function (e) {
if ($(window).width() < 650) {
$(this).toggleClass('show');
}
})
</script>
apps/www/modules/main/actions/actions.class.php
...@@ -17,7 +17,6 @@ class mainActions extends sfActions ...@@ -17,7 +17,6 @@ class mainActions extends sfActions
*/ */
public function executeIndex(sfWebRequest $request) public function executeIndex(sfWebRequest $request)
{ {
/**/
$this->setLayout('layoutHome'); $this->setLayout('layoutHome');
$this->video = Doctrine_Query::create() $this->video = Doctrine_Query::create()
->select("v.*, t.*") ->select("v.*, t.*")
...@@ -62,6 +61,7 @@ class mainActions extends sfActions ...@@ -62,6 +61,7 @@ class mainActions extends sfActions
->andWhere("c.is_main = 1") ->andWhere("c.is_main = 1")
->orderBy("RAND()") ->orderBy("RAND()")
->fetchOne(); ->fetchOne();
} }
public function executeDl(sfWebRequest $request) public function executeDl(sfWebRequest $request)
{ {
......
apps/www/modules/main/templates/indexSuccess.php
<table class="lending" style="width: 100%" cellspacing="0" cellpadding="0"> <table class="lending" style="width: 100%" cellspacing="0" cellpadding="0">
<tr> <tr>
<td> <td>
......
apps/www/modules/product/actions/actions.class.php
...@@ -56,5 +56,41 @@ class productActions extends sfActions ...@@ -56,5 +56,41 @@ class productActions extends sfActions
$this->setLayout('layoutPage'); $this->setLayout('layoutPage');
if ($this->getUser()->hasAttribute('number_of_views') && $this->getUser()->getAttribute('number_of_views') != false) {
$number_of_view = $this->getUser()->getAttribute('number_of_views');
if ($this->getUser()->getAttribute('number_of_views') < 10) {
if (!$this->getUser()->hasAttribute('ids_view_product') || $this->getUser()->getAttribute('ids_view_product') == false) {
$this->getUser()->setAttribute('ids_view_product', $this->product['id'] . ';');
} else {
$str_ids = $this->getUser()->getAttribute('ids_view_product');
$ids = explode(';', $str_ids);
if (!in_array($this->product['id'], $ids)) {
$number_of_view++;
$this->getUser()->setAttribute('number_of_views', $number_of_view);
$this->getUser()->setAttribute('ids_view_product', $str_ids . $this->product['id'] . ';');
}
}
}
if ($number_of_view == 5 || $number_of_view == 7 || $number_of_view == 10) {
if ($this->getUser()->hasAttribute('phone_number') && $this->getUser()->getAttribute('phone_number') != false) {
$date_now = new DateTime('now');
$date_limit = new DateTime('now');
$date_limit->modify('-30 day');
$phone_discount = Doctrine_Query::create()
->select()
->from('DiscountPhone dp')
->where('dp.phone = ?', $this->getUser()->getAttribute('phone_number'))
->andWhere('dp.order_id is null')
->andWhere('dp.created_at BETWEEN STR_TO_DATE(\'' . $date_limit->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\') AND STR_TO_DATE(\'' . $date_now->format('Y-m-d H:i:s') . '\', \'%Y-%m-%d %H:%i:%s\')')
->execute();
if (count($phone_discount) > 0) {
$phone_discount = $phone_discount->getFirst();
$phone_discount->setActiveDiscount($number_of_view);
$phone_discount->save();
$this->getUser()->setAttribute('active_discount', $number_of_view);
}
}
}
}
} }
} }
apps/www/modules/product/templates/_product.php
...@@ -3,14 +3,24 @@ if (isset($product)) { ...@@ -3,14 +3,24 @@ if (isset($product)) {
$translation = $product['Translation']; $translation = $product['Translation'];
$productImg = explode(';', $product['product_img']); $productImg = explode(';', $product['product_img']);
$productImg = (count($productImg) > 0 ? $productImg[0] : false); $productImg = (count($productImg) > 0 ? $productImg[0] : false);
echo '<div class="catalog_category_child_item">'; $q = Doctrine::getTable('Product')->findOneById($product['id'])->getOffer();
$discount_available = false;
foreach ($q as $offer) {
if ($offer->getDiscountAvailable() == 1) {
$discount_available = true;
break;
}
}
echo '<div class="catalog_category_child_item ' . ($discount_available ? 'discount' : '') . '">';
if ($discount_available) {
echo '<div class="discount_available"><div class="discount_available_desc">Ищите наши QR-коды в видео и соц. сетях и забирайте скидку</div><div class="discount_available_title">Доступен со скидкой</div></div>';
}
echo '<' . ($product['is_detail'] ? 'a' : 'span') . ' href="' . url_for("@product_show?alias=" . $product['alias']) . '" class="anb">'; echo '<' . ($product['is_detail'] ? 'a' : 'span') . ' href="' . url_for("@product_show?alias=" . $product['alias']) . '" class="anb">';
if($productImg){ if($productImg){
echo '<img src="/i/n.gif" style="background-image: url(/u/i/' . Page::replaceImageSize($productImg, 'S') . ');" />'; echo '<img src="/i/n.gif" style="background-image: url(/u/i/' . Page::replaceImageSize($productImg, 'S') . ');" />';
}else }else
{ {
$offerImg = ''; $offerImg = '';
$q = Doctrine::getTable('Product')->findOneById($product['id'])->getOffer();
foreach ($q as $offer) { foreach ($q as $offer) {
if (strlen($offer->getImg()) > 3) if (strlen($offer->getImg()) > 3)
$offerImg = $offer->getImg(); $offerImg = $offer->getImg();
......
apps/www/modules/product/templates/showSuccess.php
...@@ -115,7 +115,7 @@ $view = 'much'; ...@@ -115,7 +115,7 @@ $view = 'much';
<input data-initialized="1" data-id="<?php echo $offer['id']; ?>" type="radio" name="offer" onchange="counterLite.change($(this))"> <input data-initialized="1" data-id="<?php echo $offer['id']; ?>" type="radio" name="offer" onchange="counterLite.change($(this))">
<?php if ($offer['price'] > 1) { ?> <?php if ($offer['price'] > 1) { ?>
<table width="100%" cellpadding="0" cellspacing="0"> <table width="100%" cellpadding="0" cellspacing="0">
<tr> <tr <?php echo ($offer['discount_available'] == 1 ? 'class="discount' : '') ?>">
<td><?php echo $offer['title'] . $quantity_type; ?></td> <td><?php echo $offer['title'] . $quantity_type; ?></td>
<td style="white-space: nowrap;" align="right"> <td style="white-space: nowrap;" align="right">
<?php echo $offer_str; ?> <?php echo $offer_str; ?>
...@@ -125,7 +125,7 @@ $view = 'much'; ...@@ -125,7 +125,7 @@ $view = 'much';
<div class="product_counter min" data-id="<?php echo $offer['id']; ?>" data-price="<?php echo $offer['price'];?>"> <div class="product_counter min" data-id="<?php echo $offer['id']; ?>" data-price="<?php echo $offer['price'];?>">
<input type="button" class="product_counter_minus" data-symbol="-" onclick="counterLite.update($(this))"> <input type="button" class="product_counter_minus" data-symbol="-" onclick="counterLite.update($(this))">
<input autocomplete="off" type="text" class="product_counter_val" value="<?php echo ( $infoAmount ? $infoAmount : 0 ) ?>" data-symbol="-+" onkeyup="counterLite.update($(this))"> <input autocomplete="off" type="text" class="product_counter_val" value="<?php echo ( $infoAmount ? $infoAmount : 0 ) ?>" data-symbol="-+" onkeyup="counterLite.update($(this))">
<input type="button" class="product_counter_plus" data-symbol="+" onclick="counterLite.update($(this)); yaCounter48466937.reachGoal('ADD');"> <input type="button" class="product_counter_plus" data-symbol="+" onclick="counterLite.update($(this))">
</div> </div>
</td> </td>
</tr> </tr>
......
apps/www/templates/header.php
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
?> ?>
<title><?php include_slot('title', sfConfig::get('app_www_title')); ?></title> <title><?php include_slot('title', sfConfig::get('app_www_title')); ?></title>
</head> </head>
<body> <body <?php echo ($sf_request->hasParameter('url') ? 'class="scroll_hidden overlay_discount_active"' : '')?>>
<script type="text/javascript"> <script type="text/javascript">
var culture = '<?php echo $sf_user->getCulture();?>'; var culture = '<?php echo $sf_user->getCulture();?>';
</script> </script>
\ No newline at end of file
apps/www/templates/layout.php
...@@ -15,3 +15,4 @@ ...@@ -15,3 +15,4 @@
<?php include(sfConfig::get('sf_app_template_dir') . '/bottom.php'); ?> <?php include(sfConfig::get('sf_app_template_dir') . '/bottom.php'); ?>
<?php include(sfConfig::get('sf_app_template_dir') . '/footer.php'); ?> <?php include(sfConfig::get('sf_app_template_dir') . '/footer.php'); ?>
apps/www/templates/top.php
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
?> ?>
</div> </div>
</div> </div>
<?php
if ($sf_request->hasParameter('url')) {
echo '<div class="overlay_discount overlay_discount_active" onclick="discount.close();"><div class="overlay_discount__item" onclick="event.stopPropagation();">';
include_component('discount','form');
echo '</div></div>';
}
?>
<div id="panel"></div> <div id="panel"></div>
<div class="search_overlay" onclick="search.close();"> <div class="search_overlay" onclick="search.close();">
<div class="search_overlay__line" onclick="event.stopPropagation();"> <div class="search_overlay__line" onclick="event.stopPropagation();">
......
apps/www/templates/top_desktop.php
...@@ -24,15 +24,15 @@ ...@@ -24,15 +24,15 @@
<?php <?php
/*<div class="region"><a href="" class="green_link bbs_d">Уфа, Респ. Башкортостан</a></div>*/ /*<div class="region"><a href="" class="green_link bbs_d">Уфа, Респ. Башкортостан</a></div>*/
if (csSettings::get('phone')) { if (csSettings::get('phone')) {
echo '<div class="header__phone">' . __('Телефон') . ':&nbsp;<a href="tel:' . preg_replace('/[^+0-9]/', '', csSettings::get('phone')) . '" onclick="yaCounter48466937.reachGoal(\'PHONE\');">' . csSettings::get('phone') . '</a></div>'; echo '<div class="header__phone">' . __('Телефон') . ':&nbsp;<a href="tel:' . preg_replace('/[^+0-9]/', '', csSettings::get('phone')) . '">' . csSettings::get('phone') . '</a></div>';
} }
if (csSettings::get('email')) { if (csSettings::get('email')) {
echo '<div><nobr>' . __('Эл. почта') . '</nobr>:&nbsp;<a href="mailto:' . csSettings::get('email') . '" onclick="yaCounter48466937.reachGoal(\'POST\'); return true;">' . csSettings::get('email') . '</a></div>'; echo '<div><nobr>' . __('Эл. почта') . '</nobr>:&nbsp;<a href="mailto:' . csSettings::get('email') . '">' . csSettings::get('email') . '</a></div>';
} }
?> ?>
</td> </td>
<td class="top_right"> <td class="top_right">
<a href="" class="callback_open_link green_link bbs_d" onclick="callback.open();yaCounter48466937.reachGoal('CALL');return false;"><?php echo __('Заказать звонок');?></a> <a href="" class="callback_open_link green_link bbs_d" onclick="callback.open();return false;"><?php echo __('Заказать звонок');?></a>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
<table class="second_floor__table" style="width: 100%; height: 100%" cellpadding="0" cellspacing="0"> <table class="second_floor__table" style="width: 100%; height: 100%" cellpadding="0" cellspacing="0">
<tr> <tr>
<?php <?php
if ($sf_user->hasAttribute('active_discount') && $sf_user->getAttribute('active_discount') != false) {
$active_discount = $sf_user->getAttribute('active_discount');
}
$module_action = $sf_request->getParameter('module') . '_' . $sf_request->getParameter('action'); $module_action = $sf_request->getParameter('module') . '_' . $sf_request->getParameter('action');
echo '<td width="100' . ($module_action == 'basket_complete' ? '%' : '') . '" align="center">'; echo '<td width="100' . ($module_action == 'basket_complete' ? '%' : '') . '" align="center">';
$logo = '<img width="100" height="51" src="/i/logo.svg" />'; $logo = '<img width="100" height="51" src="/i/logo.svg" />';
...@@ -54,7 +57,7 @@ ...@@ -54,7 +57,7 @@
echo '<td class="top_menu">'; echo '<td class="top_menu">';
include_component('main', 'menu'); include_component('main', 'menu');
echo '</td>'; echo '</td>';
echo '<td class="top_right">'; echo '<td style="position: relative;" class="top_right ' . ($module_action == 'basket_index' ? (isset($active_discount) ? 'discount_basket' : '') : (isset($active_discount) ? 'discount d' . $active_discount : '') ) . '">';
if($module_action != 'search_search'){ if($module_action != 'search_search'){
echo '<div class="search_btn" onclick="search._show();"></div>'; echo '<div class="search_btn" onclick="search._show();"></div>';
} }
......
apps/www/templates/top_mobile.php
<div class="header_mobile mobile"> <?php
if ($sf_user->hasAttribute('active_discount') && $sf_user->getAttribute('active_discount') != false) {
$discount = $sf_user->getAttribute('active_discount');
} else {
$discount = false;
}
?>
<div class="header_mobile mobile <?php echo ($discount ? 'discount d' . $discount : '' )?>">
<table cellspacing="0" cellpadding="0" width="100%"> <table cellspacing="0" cellpadding="0" width="100%">
<tbody align="left" valign="middle"> <tbody align="left" valign="middle">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<?php echo csSettings::get('phone') ? '<a href="tel:'. csSettings::get('phone') .'" class="header_mobile__phone_link" onclick="yaCounter48466937.reachGoal(\'PHONE\');">'. csSettings::get('phone') .'</a>' : ''; ?> <?php echo csSettings::get('phone') ? '<a href="tel:'. csSettings::get('phone') .'" class="header_mobile__phone_link">'. csSettings::get('phone') .'</a>' : ''; ?>
</td> </td>
<td width="1" align="right"> <td width="1" align="right">
...@@ -36,13 +43,13 @@ ...@@ -36,13 +43,13 @@
</ul> </ul>
<div class="burder__contacts"> <div class="burder__contacts">
<?php if (csSettings::get('phone')) { <?php if (csSettings::get('phone')) {
echo __('Телефон') . ':&nbsp;<a href="tel:' . preg_replace('/[^+0-9]/', '', csSettings::get('phone')) . '" class="anb" onclick="yaCounter48466937.reachGoal(\'PHONE\');">' . csSettings::get('phone') . '</a><i class="br10"></i>'; echo __('Телефон') . ':&nbsp;<a href="tel:' . preg_replace('/[^+0-9]/', '', csSettings::get('phone')) . '" class="anb">' . csSettings::get('phone') . '</a><i class="br10"></i>';
} }
if (csSettings::get('email')) { if (csSettings::get('email')) {
echo __('Эл. почта') . '</nobr>:&nbsp;<a href="mailto:' . csSettings::get('email') . '" onclick="yaCounter48466937.reachGoal(\'POST\');return true;">' . csSettings::get('email') . '</a>'; echo __('Эл. почта') . '</nobr>:&nbsp;<a href="mailto:' . csSettings::get('email') . '">' . csSettings::get('email') . '</a>';
} ?> } ?>
</div> </div>
<a href="" class="btn white_b_btn burder__callback_link" onclick="callback.open();yaCounter48466937.reachGoal('CALL');return false;">Заказать звонок</a> <a href="" class="btn white_b_btn burder__callback_link" onclick="callback.open();return false;">Заказать звонок</a>
</div> </div>
......
config/app.yml
...@@ -3,7 +3,7 @@ all: ...@@ -3,7 +3,7 @@ all:
arm_title: 'Иди в баню - АРМ' arm_title: 'Иди в баню - АРМ'
seo_header_sepr: ' - ' seo_header_sepr: ' - '
email_order: 'ufaros@gmail.com' email_order: 'ufaros@gmail.com'
email_from: 'noreply@idivbanu.ru' email_from: 'noreply@stone-dev.atmadev.ru'
secret_key: '2R]btNuO%c/L!}}[v"tY!pWX2JZ{03;!' secret_key: '2R]btNuO%c/L!}}[v"tY!pWX2JZ{03;!'
default_culture: ru_RU default_culture: ru_RU
import_auth_user: bath import_auth_user: bath
......
config/databases.yml
...@@ -2,6 +2,6 @@ all: ...@@ -2,6 +2,6 @@ all:
doctrine: doctrine:
class: sfDoctrineDatabase class: sfDoctrineDatabase
param: param:
dsn: 'mysql:host=127.0.0.1;dbname=idivbanu' dsn: 'mysql:host=127.0.0.1;dbname=stone_dev'
username: root username: root
password: h7!nIay6HUtu password: h7!nIay6HUtu
config/doctrine/schema.yml
...@@ -481,6 +481,9 @@ Offer: ...@@ -481,6 +481,9 @@ Offer:
sort: sort:
type: integer type: integer
default: 0 default: 0
discount_available:
type: boolean
default: false
relations: relations:
Product: Product:
onDelete: CASCADE onDelete: CASCADE
...@@ -543,6 +546,11 @@ BasketOrder: ...@@ -543,6 +546,11 @@ BasketOrder:
type: boolean type: boolean
notnull: true notnull: true
default: false default: false
relations:
DiscountPhone:
onDelete: SET NULL
local: id
foreign: order_id
BasketOffer: BasketOffer:
columns: columns:
...@@ -617,3 +625,47 @@ Callback: ...@@ -617,3 +625,47 @@ Callback:
offer_id: offer_id:
type: text type: text
notnull: false notnull: false
Discount:
actAs:
Timestampable: ~
columns:
title:
type: string(255)
notnull: true
utm:
type: string(255)
notnull: true
comment:
type: string(1000)
notnull: false
url:
type: string(20)
DiscountPhone:
actAs:
Timestampable: ~
columns:
phone:
type: string(20)
notnull: true
discount_id:
type: integer
notnull: true
order_id:
type: string(255)
notnull: false
default: null
active_discount:
type: integer
notnull: true
default: 3
relations:
BasketOrder:
onDelete: SET NULL
local: order_id
foreign: id
Discount:
onDelete: CASCADE
local: discount_id
foreign: id
\ No newline at end of file
config/properties.ini
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
host=192.168.2.7 host=192.168.2.7
port=22 port=22
user=root user=root
dir=/www/stone-dev.atmadev.ru/ dir=/www/idivbanu.ru/
type=rsync type=rsync
[stone] [stone]
host=192.168.2.7 host=192.168.2.7
......
config/rsync_exclude.txt
...@@ -4,6 +4,21 @@ ...@@ -4,6 +4,21 @@
/.ramcache /.ramcache
/.ramcache/* /.ramcache/*
/config/databases.yml /config/databases.yml
/data/exchange /symfony
/test
/upload
/log /log
/.ramcache
/.idea
/.git
/config/databases.yml
/config/app.yml
/data
/apps/www/config/factories.yml
/apps/arm/config/factories.yml
/symfony /symfony
/web/index.php
/web/a.php
/web/u
/config/properties.ini
/config/rsync_exclude.txt
\ No newline at end of file
lib/filter/doctrine/base/BaseOfferFormFilter.class.php
...@@ -21,6 +21,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine ...@@ -21,6 +21,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine
'is_delete' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))), 'is_delete' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
'is_wholesale' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))), 'is_wholesale' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
'sort' => new sfWidgetFormFilterInput(), 'sort' => new sfWidgetFormFilterInput(),
'discount_available' => new sfWidgetFormChoice(array('choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no'))),
'created_at' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)), 'created_at' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)),
'updated_at' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)), 'updated_at' => new sfWidgetFormFilterDate(array('from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate(), 'with_empty' => false)),
)); ));
...@@ -34,6 +35,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine ...@@ -34,6 +35,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine
'is_delete' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))), 'is_delete' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
'is_wholesale' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))), 'is_wholesale' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
'sort' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))), 'sort' => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
'discount_available' => new sfValidatorChoice(array('required' => false, 'choices' => array('', 1, 0))),
'created_at' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59')))), 'created_at' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59')))),
'updated_at' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59')))), 'updated_at' => new sfValidatorDateRange(array('required' => false, 'from_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 00:00:00')), 'to_date' => new sfValidatorDateTime(array('required' => false, 'datetime_output' => 'Y-m-d 23:59:59')))),
)); ));
...@@ -64,6 +66,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine ...@@ -64,6 +66,7 @@ abstract class BaseOfferFormFilter extends BaseFormFilterDoctrine
'is_delete' => 'Boolean', 'is_delete' => 'Boolean',
'is_wholesale' => 'Boolean', 'is_wholesale' => 'Boolean',
'sort' => 'Number', 'sort' => 'Number',
'discount_available' => 'Boolean',
'created_at' => 'Date', 'created_at' => 'Date',
'updated_at' => 'Date', 'updated_at' => 'Date',
); );
......
lib/filter/doctrine/base/BaseofferTranslationFormFilter.class.php
<?php <?php
/** /**
* OfferTranslation filter form base class. * offerTranslation filter form base class.
* *
* @package sf * @package sf
* @subpackage filter * @subpackage filter
* @author Atma * @author Atma
* @version SVN: $Id: sfDoctrineFormFilterGeneratedTemplate.php 24171 2009-11-19 16:37:50Z Kris.Wallsmith $ * @version SVN: $Id: sfDoctrineFormFilterGeneratedTemplate.php 24171 2009-11-19 16:37:50Z Kris.Wallsmith $
*/ */
abstract class BaseOfferTranslationFormFilter extends BaseFormFilterDoctrine abstract class BaseofferTranslationFormFilter extends BaseFormFilterDoctrine
{ {
public function setup() public function setup()
{ {
$this->setWidgets(array( $this->setWidgets(array(
'title' => new sfWidgetFormFilterInput(array('with_empty' => false)), 'title' => new sfWidgetFormFilterInput(),
'quantity_type' => new sfWidgetFormFilterInput(array('with_empty' => false)),
)); ));
$this->setValidators(array( $this->setValidators(array(
'title' => new sfValidatorPass(array('required' => false)), 'title' => new sfValidatorPass(array('required' => false)),
'quantity_type' => new sfValidatorPass(array('required' => false)),
)); ));
$this->widgetSchema->setNameFormat('offer_translation_filters[%s]'); $this->widgetSchema->setNameFormat('offer_translation_filters[%s]');
...@@ -33,7 +31,7 @@ abstract class BaseOfferTranslationFormFilter extends BaseFormFilterDoctrine ...@@ -33,7 +31,7 @@ abstract class BaseOfferTranslationFormFilter extends BaseFormFilterDoctrine
public function getModelName() public function getModelName()
{ {
return 'OfferTranslation'; return 'offerTranslation';
} }
public function getFields() public function getFields()
...@@ -41,7 +39,6 @@ abstract class BaseOfferTranslationFormFilter extends BaseFormFilterDoctrine ...@@ -41,7 +39,6 @@ abstract class BaseOfferTranslationFormFilter extends BaseFormFilterDoctrine
return array( return array(
'id' => 'Number', 'id' => 'Number',
'title' => 'Text', 'title' => 'Text',
'quantity_type' => 'Text',
'lang' => 'Text', 'lang' => 'Text',
); );
} }
......
lib/filter/doctrine/offerTranslationFormFilter.class.php
<?php <?php
/** /**
* OfferTranslation filter form. * offerTranslation filter form.
* *
* @package sf * @package sf
* @subpackage filter * @subpackage filter
* @author Atma * @author Atma
* @version SVN: $Id: sfDoctrineFormFilterTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $ * @version SVN: $Id: sfDoctrineFormFilterTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
*/ */
class OfferTranslationFormFilter extends BaseOfferTranslationFormFilter class offerTranslationFormFilter extends BaseofferTranslationFormFilter
{ {
public function configure() public function configure()
{ {
......
lib/form/doctrine/OfferForm.class.php
...@@ -13,7 +13,7 @@ class OfferForm extends BaseOfferForm ...@@ -13,7 +13,7 @@ class OfferForm extends BaseOfferForm
public function configure() public function configure()
{ {
$this->embedI18n(array('ru', 'en')); $this->embedI18n(array('ru', 'en'));
$this->useFields(array('ru', 'en', 'quantity_type_select', 'price', 'sort', 'is_wholesale', 'img', 'product_id')); $this->useFields(array('ru', 'en', 'quantity_type_select', 'price', 'sort', 'discount_available', 'img', 'product_id'));
$parentId = sfContext::getInstance()->getRequest()->getParameter('parentId'); $parentId = sfContext::getInstance()->getRequest()->getParameter('parentId');
if($parentId){ if($parentId){
...@@ -22,7 +22,7 @@ class OfferForm extends BaseOfferForm ...@@ -22,7 +22,7 @@ class OfferForm extends BaseOfferForm
$this->setDefault('product_id', $parentId); $this->setDefault('product_id', $parentId);
} }
} }
$this->widgetSchema['is_wholesale'] = new sfWidgetFormInputCheckbox(array('label' => 'Чужой товар'), array("required" => true)); $this->widgetSchema['discount_available'] = new sfWidgetFormInputCheckbox(array('label' => 'Доступен со скидкой?'), array("required" => true));
$this->widgetSchema['product_id'] = new sfWidgetFormInputHidden(); $this->widgetSchema['product_id'] = new sfWidgetFormInputHidden();
$this->widgetSchema['ru']['title'] = new sfWidgetFormInputText(array("label" => "Название"), array("size" => 64, "maxlength" => 255, "required" => true)); $this->widgetSchema['ru']['title'] = new sfWidgetFormInputText(array("label" => "Название"), array("size" => 64, "maxlength" => 255, "required" => true));
$this->widgetSchema['en']['title'] = new sfWidgetFormInputText(array("label" => "Название"), array("size" => 64, "maxlength" => 255, "required" => true)); $this->widgetSchema['en']['title'] = new sfWidgetFormInputText(array("label" => "Название"), array("size" => 64, "maxlength" => 255, "required" => true));
......
lib/form/doctrine/base/BaseOfferForm.class.php
...@@ -24,6 +24,7 @@ abstract class BaseOfferForm extends BaseFormDoctrine ...@@ -24,6 +24,7 @@ abstract class BaseOfferForm extends BaseFormDoctrine
'is_delete' => new sfWidgetFormInputCheckbox(array(), array("required" => true)), 'is_delete' => new sfWidgetFormInputCheckbox(array(), array("required" => true)),
'is_wholesale' => new sfWidgetFormInputCheckbox(array(), array("required" => true)), 'is_wholesale' => new sfWidgetFormInputCheckbox(array(), array("required" => true)),
'sort' => new sfWidgetFormInputText(array(), array("size" => 8, "maxlength" => 8)), 'sort' => new sfWidgetFormInputText(array(), array("size" => 8, "maxlength" => 8)),
'discount_available' => new sfWidgetFormInputCheckbox(array(), array()),
'created_at' => new sfWidgetFormDateTime(array(), array("required" => true)), 'created_at' => new sfWidgetFormDateTime(array(), array("required" => true)),
'updated_at' => new sfWidgetFormDateTime(array(), array("required" => true)), 'updated_at' => new sfWidgetFormDateTime(array(), array("required" => true)),
)); ));
...@@ -38,6 +39,7 @@ abstract class BaseOfferForm extends BaseFormDoctrine ...@@ -38,6 +39,7 @@ abstract class BaseOfferForm extends BaseFormDoctrine
'is_delete' => new sfValidatorBoolean(array('required' => false)), 'is_delete' => new sfValidatorBoolean(array('required' => false)),
'is_wholesale' => new sfValidatorBoolean(array('required' => false)), 'is_wholesale' => new sfValidatorBoolean(array('required' => false)),
'sort' => new sfValidatorInteger(array('required' => false)), 'sort' => new sfValidatorInteger(array('required' => false)),
'discount_available' => new sfValidatorBoolean(array('required' => false)),
'created_at' => new sfValidatorDateTime(), 'created_at' => new sfValidatorDateTime(),
'updated_at' => new sfValidatorDateTime(), 'updated_at' => new sfValidatorDateTime(),
)); ));
......
lib/form/doctrine/wwwBasketOrderForm.class.php
...@@ -22,9 +22,6 @@ class wwwBasketOrderForm extends BaseBasketOrderForm ...@@ -22,9 +22,6 @@ class wwwBasketOrderForm extends BaseBasketOrderForm
$this->validatorSchema['delivery_type'] = new sfValidatorChoice(array('choices' => array(0 => 'Самовывоз', 1 => 'Доставка по адресу'), 'required' => true)); $this->validatorSchema['delivery_type'] = new sfValidatorChoice(array('choices' => array(0 => 'Самовывоз', 1 => 'Доставка по адресу'), 'required' => true));
$this->validatorSchema['phone'] = new sfValidatorAnd(array( $this->validatorSchema['phone'] = new sfValidatorString(array('max_length' => 24, 'required' => true));
new sfValidatorNumber(array('required' => true)),
new sfValidatorString(array('max_length' => 24, 'required' => true))
));
} }
} }
lib/model/doctrine/base/BaseBasketOrder.class.php
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* @property boolean $is_confirm_admin * @property boolean $is_confirm_admin
* @property boolean $is_payed * @property boolean $is_payed
* @property boolean $is_given * @property boolean $is_given
* @property DiscountPhone $DiscountPhone
* @property Doctrine_Collection $Basket * @property Doctrine_Collection $Basket
* *
* @method string getUsername() Returns the current record's "username" value * @method string getUsername() Returns the current record's "username" value
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
* @method boolean getIsConfirmAdmin() Returns the current record's "is_confirm_admin" value * @method boolean getIsConfirmAdmin() Returns the current record's "is_confirm_admin" value
* @method boolean getIsPayed() Returns the current record's "is_payed" value * @method boolean getIsPayed() Returns the current record's "is_payed" value
* @method boolean getIsGiven() Returns the current record's "is_given" value * @method boolean getIsGiven() Returns the current record's "is_given" value
* @method DiscountPhone getDiscountPhone() Returns the current record's "DiscountPhone" value
* @method Doctrine_Collection getBasket() Returns the current record's "Basket" collection * @method Doctrine_Collection getBasket() Returns the current record's "Basket" collection
* @method BasketOrder setUsername() Sets the current record's "username" value * @method BasketOrder setUsername() Sets the current record's "username" value
* @method BasketOrder setPhone() Sets the current record's "phone" value * @method BasketOrder setPhone() Sets the current record's "phone" value
...@@ -44,6 +46,7 @@ ...@@ -44,6 +46,7 @@
* @method BasketOrder setIsConfirmAdmin() Sets the current record's "is_confirm_admin" value * @method BasketOrder setIsConfirmAdmin() Sets the current record's "is_confirm_admin" value
* @method BasketOrder setIsPayed() Sets the current record's "is_payed" value * @method BasketOrder setIsPayed() Sets the current record's "is_payed" value
* @method BasketOrder setIsGiven() Sets the current record's "is_given" value * @method BasketOrder setIsGiven() Sets the current record's "is_given" value
* @method BasketOrder setDiscountPhone() Sets the current record's "DiscountPhone" value
* @method BasketOrder setBasket() Sets the current record's "Basket" collection * @method BasketOrder setBasket() Sets the current record's "Basket" collection
* *
* @package sf * @package sf
...@@ -126,6 +129,11 @@ abstract class BaseBasketOrder extends sfDoctrineRecord ...@@ -126,6 +129,11 @@ abstract class BaseBasketOrder extends sfDoctrineRecord
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
$this->hasOne('DiscountPhone', array(
'local' => 'id',
'foreign' => 'order_id',
'onDelete' => 'SET NULL'));
$this->hasMany('Basket', array( $this->hasMany('Basket', array(
'local' => 'id', 'local' => 'id',
'foreign' => 'basket_order_id')); 'foreign' => 'basket_order_id'));
......
lib/model/doctrine/base/BaseOffer.class.php
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* @property boolean $is_delete * @property boolean $is_delete
* @property boolean $is_wholesale * @property boolean $is_wholesale
* @property integer $sort * @property integer $sort
* @property boolean $discount_available
* @property Product $Product * @property Product $Product
* @property Doctrine_Collection $BasketOffer * @property Doctrine_Collection $BasketOffer
* *
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
* @method boolean getIsDelete() Returns the current record's "is_delete" value * @method boolean getIsDelete() Returns the current record's "is_delete" value
* @method boolean getIsWholesale() Returns the current record's "is_wholesale" value * @method boolean getIsWholesale() Returns the current record's "is_wholesale" value
* @method integer getSort() Returns the current record's "sort" value * @method integer getSort() Returns the current record's "sort" value
* @method boolean getDiscountAvailable() Returns the current record's "discount_available" value
* @method Product getProduct() Returns the current record's "Product" value * @method Product getProduct() Returns the current record's "Product" value
* @method Doctrine_Collection getBasketOffer() Returns the current record's "BasketOffer" collection * @method Doctrine_Collection getBasketOffer() Returns the current record's "BasketOffer" collection
* @method Offer setInnerId() Sets the current record's "inner_id" value * @method Offer setInnerId() Sets the current record's "inner_id" value
...@@ -40,6 +42,7 @@ ...@@ -40,6 +42,7 @@
* @method Offer setIsDelete() Sets the current record's "is_delete" value * @method Offer setIsDelete() Sets the current record's "is_delete" value
* @method Offer setIsWholesale() Sets the current record's "is_wholesale" value * @method Offer setIsWholesale() Sets the current record's "is_wholesale" value
* @method Offer setSort() Sets the current record's "sort" value * @method Offer setSort() Sets the current record's "sort" value
* @method Offer setDiscountAvailable() Sets the current record's "discount_available" value
* @method Offer setProduct() Sets the current record's "Product" value * @method Offer setProduct() Sets the current record's "Product" value
* @method Offer setBasketOffer() Sets the current record's "BasketOffer" collection * @method Offer setBasketOffer() Sets the current record's "BasketOffer" collection
* *
...@@ -100,6 +103,10 @@ abstract class BaseOffer extends sfDoctrineRecord ...@@ -100,6 +103,10 @@ abstract class BaseOffer extends sfDoctrineRecord
'type' => 'integer', 'type' => 'integer',
'default' => 0, 'default' => 0,
)); ));
$this->hasColumn('discount_available', 'boolean', null, array(
'type' => 'boolean',
'default' => false,
));
} }
public function setUp() public function setUp()
......
lib/task/exchangeDeleteimageTask.class.php
...@@ -222,6 +222,7 @@ class exchangeDeleteimageTask extends sfBaseTask ...@@ -222,6 +222,7 @@ class exchangeDeleteimageTask extends sfBaseTask
} }
$error = array(); $error = array();
$countDel = 0; $countDel = 0;
if (count($allImageInDir) > 0 ) {
foreach ($allImageInDir as $item) { foreach ($allImageInDir as $item) {
if (file_exists($item)) { if (file_exists($item)) {
chmod($item, 0777); chmod($item, 0777);
...@@ -231,6 +232,8 @@ class exchangeDeleteimageTask extends sfBaseTask ...@@ -231,6 +232,8 @@ class exchangeDeleteimageTask extends sfBaseTask
$error[] = 'file not found:' . $item; $error[] = 'file not found:' . $item;
} }
} }
}
print_r($allImageInDir); print_r($allImageInDir);
$this->log('Count delete image: ' . $countDel); $this->log('Count delete image: ' . $countDel);
......
web/arm.php
<?php <?php
require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
$configuration = ProjectConfiguration::getApplicationConfiguration('arm', 'prod', false); $configuration = ProjectConfiguration::getApplicationConfiguration('arm', 'dev', true);
sfContext::createInstance($configuration)->dispatch(); sfContext::createInstance($configuration)->dispatch();
web/css/a.css
...@@ -399,6 +399,41 @@ ...@@ -399,6 +399,41 @@
font-family: 'robotoregular'; font-family: 'robotoregular';
} }
.product_offer table tr.discount::after {
content: '';
position: absolute;
width: 10px;
height: 10px;
left: -5px;
top: 5px;
background-repeat: no-repeat;
background-size: contain;
background-image: url(/i/percent_colored.svg);
}
.header_mobile.mobile.discount::after {
content: '';
width: 61px;
height: 137px;
position: absolute;
background-repeat: no-repeat;
background-size: contain;
right: 6px;
top: 96px;
z-index: -1;
}
.header_mobile.mobile.discount.d3::after {
background-image: url(/i/d3.svg);
}
.header_mobile.mobile.discount.d5::after {
background-image: url(/i/d5.svg);
}
.header_mobile.mobile.discount.d7::after {
background-image: url(/i/d7.svg);
}
.header_mobile.mobile.discount.d10::after {
background-image: url(/i/d10.svg);
}
.product__advantages__info__link { .product__advantages__info__link {
font-size: 20px; font-size: 20px;
} }
...@@ -443,7 +478,7 @@ ...@@ -443,7 +478,7 @@
height: auto; height: auto;
} }
.video { .video {
height: 62vw; height: 62vw !important;
} }
.article_wrap { .article_wrap {
...@@ -674,6 +709,7 @@ ...@@ -674,6 +709,7 @@
} }
.footer_table_main { .footer_table_main {
padding: 20px 0 20px; padding: 20px 0 20px;
border-top: 1px solid #ececec;
} }
.footer_table_main__policy { .footer_table_main__policy {
font-style: normal; font-style: normal;
...@@ -731,8 +767,62 @@ ...@@ -731,8 +767,62 @@
max-height: 10000px; max-height: 10000px;
} }
.overlay_discount__item {
height: 100%;
max-height: 510px;
}
.image_discount {
display: none;
}
.form_discount {
width: 100%;
max-height: 510px;
height: 100%;
}
.discount_available {
left: 13px !important;
}
.discount_available.show .discount_available_desc{
max-height: 100px;
padding: 5px 5px;
width: 100%;
}
.discount_available.show .discount_available_title {
border-radius: 0 0 4px 4px;
}
.discount_available.show:before {
background-image: url(/i/white_angle.svg);
transition: all 0s ease-in-out;
}
.basket_refresh {
position: relative;
overflow: visible;
z-index: 1;
}
.discount_form__title {
font-size: 21px;
}
} }
@media (min-width: 650px){
.catalog_category_child_item:hover .discount_available_desc{
max-height: 100px;
padding: 5px 5px;
width: 100%;
}
.catalog_category_child_item:hover .discount_available_title {
border-radius: 0 0 4px 4px;
}
.catalog_category_child_item:hover .discount_available:before {
background-image: url(/i/white_angle.svg);
transition: all 0s ease-in-out;
}
}
@media (min-width: 1100px) and (max-width: 1200px) { @media (min-width: 1100px) and (max-width: 1200px) {
.top_menu__elem{ .top_menu__elem{
......
web/css/p.css
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 8px; margin-top: 8px;
} }
.basket_btn::before { .basket_btn::before {
content: ''; content: '';
background-image: url(/i/basket.svg); background-image: url(/i/basket.svg);
width: 23px; width: 23px;
...@@ -243,9 +243,43 @@ ...@@ -243,9 +243,43 @@
background-size: cover; background-size: cover;
background-position: 100% 0; background-position: 100% 0;
transition: background-image 0.1s ease-in-out; transition: background-image 0.1s ease-in-out;
} }
.basket_btn:not(.basket_btn_disabled):hover::before { .basket_btn:not(.basket_btn_disabled):hover::before {
background-image: url(/i/basket-green.svg); background-image: url(/i/basket-green.svg);
}
.top_right.discount::after {
width: 65px;
height: 148px;
background-size: contain;
background-repeat: no-repeat;
content: "";
position: absolute;
top: 75px;
right: 0;
z-index: -1;
}
.top_right.discount.d3::after {
background-image: url(/i/d3.svg);
}
.top_right.discount.d5::after {
background-image: url(/i/d5.svg);
}
.top_right.discount.d7::after {
background-image: url(/i/d7.svg);
}
.top_right.discount.d10::after {
background-image: url(/i/d10.svg);
}
.top_right.discount_basket::after {
content: '';
width: 30px;
height: 30px;
background-size: contain;
background-repeat: no-repeat;
position: absolute;
top: 5px;
right: -10px;
background-image: url(/i/percent_white.svg);
} }
.swicher_lang { .swicher_lang {
background-image: url(/i/switch-lang.svg); background-image: url(/i/switch-lang.svg);
...@@ -567,7 +601,18 @@ ...@@ -567,7 +601,18 @@
color: var(--green-color-text); color: var(--green-color-text);
} }
.product_offer table td { .product_offer table td {
padding: 12px 10px 11px; padding: 12px 0 11px 10px;
}
.product_offer table tr.discount::after {
content: '';
position: absolute;
width: 16px;
height: 16px;
left: -20px;
top: 5px;
background-repeat: no-repeat;
background-size: contain;
background-image: url(/i/percent_colored.svg);
} }
.product_offer table td:first-child { .product_offer table td:first-child {
padding-left: 0; padding-left: 0;
...@@ -728,6 +773,58 @@ ...@@ -728,6 +773,58 @@
display: inline-block; display: inline-block;
margin: 0 8px 30px; margin: 0 8px 30px;
} }
.catalog_category_child_item.discount {
}
.catalog_category_child_item .discount_available {
position: absolute;
color: #FFFFFF;
width: 150px;
left: 21px;
top: -5px;
z-index: 100;
}
.discount_available .discount_available_desc {
background-color: #FFFFFF;
color: #6a6a6a;
overflow: hidden;
max-height: 0px;
font-family: 'robotolight';
font-size: 12px;
padding: 0 5px;
box-shadow: 0 0 14px rgba(0,0,0,0.2);
transition: all 0.3s ease-in-out;
}
.discount_available .discount_available_title {
background-color: #fb8100;
color: #FFFFFF;
width: 150px;
border-radius: 0 4px 4px 4px;
padding: 7px 7px 7px 10px;
z-index: 100;
text-transform: uppercase;
font-family: 'robotobold';
font-size: 11px;
}
.catalog_category_child_item .discount_available::before {
content: '';
width: 14px;
height: 6px;
position: absolute;
background-size: contain;
background-repeat: no-repeat;
background-image: url(/i/orange_angle.svg);
left: -12px;
top: 0;
transition: all 0.48s ease-in-out;
}
.lending_product_area .catalog_category_child_item:nth-child(n+9) { .lending_product_area .catalog_category_child_item:nth-child(n+9) {
display: none; display: none;
} }
...@@ -913,6 +1010,7 @@ ...@@ -913,6 +1010,7 @@
background-image: url(/i/combined-shape-minus.svg); background-image: url(/i/combined-shape-minus.svg);
outline: none; outline: none;
padding: 0; padding: 0;
border-radius: 0;
} }
.product_counter_val { .product_counter_val {
width: 45px; width: 45px;
...@@ -933,6 +1031,7 @@ ...@@ -933,6 +1031,7 @@
height: 29px; height: 29px;
vertical-align: top; vertical-align: top;
float: left; float: left;
border-radius: 0px !important;
} }
.product_counter_plus { .product_counter_plus {
width: 23px; width: 23px;
...@@ -963,6 +1062,7 @@ ...@@ -963,6 +1062,7 @@
background-image: url(/i/combined-shape-plus.svg); background-image: url(/i/combined-shape-plus.svg);
outline: none; outline: none;
padding: 0; padding: 0;
border-radius: 0;
} }
.product_price_trigger { .product_price_trigger {
padding: 0; padding: 0;
...@@ -1725,6 +1825,18 @@ label.custom_checkbox input:checked + .after_checkbox { ...@@ -1725,6 +1825,18 @@ label.custom_checkbox input:checked + .after_checkbox {
background-position: center; background-position: center;
border: 1px solid #ececec; border: 1px solid #ececec;
} }
.basket_img.discount::after {
content: '';
position: absolute;
width: 30px;
height: 30px;
top: -10px;
right: -10px;
background-image: url(/i/percent_colored.svg);
background-repeat: no-repeat;
background-size: contain;
z-index: 100;
}
.basket_img__item{ .basket_img__item{
width:100%; width:100%;
height:100%; height:100%;
...@@ -1835,7 +1947,8 @@ label.custom_checkbox input:checked + .after_checkbox { ...@@ -1835,7 +1947,8 @@ label.custom_checkbox input:checked + .after_checkbox {
.basket_get{ .basket_get{
margin-bottom: 40px; margin-bottom: 40px;
} }
.basket_buyer__item{ .basket_buyer__item {
position: relative;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
} }
...@@ -2160,7 +2273,6 @@ h2{ ...@@ -2160,7 +2273,6 @@ h2{
display: inline-block; display: inline-block;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
width: calc(100% - 5px);
} }
.review_file_overlay__item{ .review_file_overlay__item{
padding:20px; padding:20px;
...@@ -2240,11 +2352,13 @@ h2{ ...@@ -2240,11 +2352,13 @@ h2{
.search_active .search_overlay{ .search_active .search_overlay{
display: block; display: block;
} }
.search_active .body_wrapper{ .search_active .body_wrapper,
.overlay_discount_active .body_wrapper {
-webkit-filter: blur(10px); -webkit-filter: blur(10px);
-moz-filter: blur(10px); -moz-filter: blur(10px);
filter: blur(10px); filter: blur(10px);
opacity: 0.4; opacity: 0.4;
transition: all 0.3s ease-in-out;
} }
.search_overlay__line__btn{ .search_overlay__line__btn{
margin-bottom: 0; margin-bottom: 0;
...@@ -2688,3 +2802,159 @@ h2{ ...@@ -2688,3 +2802,159 @@ h2{
.fotorama__stage__frame { .fotorama__stage__frame {
border: 1px solid #ececec !important; border: 1px solid #ececec !important;
} }
.discount_form__checkbox {
max-width: 325px
}
.discount_form__checkbox label {
text-align: left;
}
.discount_form{
background: #fff;
margin: 0 auto;
border-radius: 0 2px 2px 0;
width: 100%;
max-width:400px;
margin: 0;
}
.discount_form input[type="text"]{
width:100%;
}
.discount_form__inp_wrap{
margin-bottom: 25px;
text-align:left;
}
.discount_form_done__title,
.discount_form_done .discount_form__process{
display:none;
}
.discount_form_done .discount_form_done__title{
display:block;
font-size: 20px;
color: var(--green-color-text);
font-family: 'robotolight';
}
.discount_form_done__title__base{
font-size:30px;
}
.discount_form__title{
font-size: 31px;
padding-bottom: 15px;
color: var(--green-color-text);
font-family: 'robotoregular';
}
.discount_form_head_text {
font-size: 18px;
font-family: 'robotoregular';
color: var(--green-color-text);
text-align: left;
padding: 25px 0 5px 0;
}
.discount_form_text {
font-size: 15px;
font-family: 'robotoregular';
text-align: left;
padding-bottom: 20px;
}
.discount_form__submit{
font-size: 15px;
font-size: 15px;
padding: 9px 23px;
cursor: pointer;
width: 100%;
}
.overlay_discount_active{
position: fixed;
background-image: url(/i/drops.png);
background-repeat: repeat;
background-size: cover;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1001;
text-align: center;
vertical-align: middle;
overflow-y: scroll;
}
.review_file_overlay{
z-index: 1001;
}
.overlay_discount{
display:none;
z-index:1002;
}
.overlay_discount_active {
display:block;
}
.video_overlay__close:hover{
opacity: 1;
}
.overlay_discount:after{
content: '';
display: inline-block;
height: 100%;
width: 0;
vertical-align: middle;
}
.overlay_discount__item{
display: inline-block;
text-align: center;
vertical-align: middle;
box-shadow: 0 0 35px rgba(0,0,0,0.3);
max-height: 400px;
}
.discount_error {
background-color: #FFFFFF;
padding: 35px 35px;
margin: 0 auto;
border-radius: 2px;
display: inline-block;
max-width: 400px;
width: 100%;
}
.image_discount {
width: 350px;
height: 400px;
background-repeat: no-repeat;
background-size: contain;
background-image: url(/i/discount-image.png);
display: inline-block;
border-radius: 2px 0 0 2px;
vertical-align: top;
}
.form_discount {
padding: 35px 40px;
width: 490px;
height: 100%;
vertical-align: top;
display: inline-block;
background-color: #FFFFFF;
border-radius: 0 2px 2px 0;
vertical-align: top;
max-height: 400px;
}
.phone_info {
position: absolute;
display: inherit;
margin-bottom: 10px;
font-size: 11px;
font-family: 'robotolight', Arial;
font-style: italic;
top: -17px;
left: 0;
}
.basket_discount {
display: block;
color: #979797;
font-size: 15px !important;
text-align: right;
position: absolute;
top: -15px;
right: 0;
}
.basket_item {
display: block;
text-align: right;
color: #074611;
}
\ No newline at end of file
web/index.php
<?php <?php
require_once(dirname(__FILE__) . '/../config/ProjectConfiguration.class.php'); require_once(dirname(__FILE__) . '/../config/ProjectConfiguration.class.php');
$configuration = ProjectConfiguration::getApplicationConfiguration('www', 'prod', true); $configuration = ProjectConfiguration::getApplicationConfiguration('www', 'dev', true);
sfContext::createInstance($configuration)->dispatch(); sfContext::createInstance($configuration)->dispatch();
web/js/init.d.js
...@@ -2663,6 +2663,47 @@ var imgUpload = { ...@@ -2663,6 +2663,47 @@ var imgUpload = {
} }
}; };
var discount = {
submit: function(form){
form = $(form);
$.post(form.attr('action'), form.serialize(), function (html) {
$('.overlay_discount__item').html(html);
if ($(window).width() < 650) {
$('.header_mobile').addClass('discount');
$('.header_mobile').addClass('d3');
} else {
$($('.top_right')[1]).addClass('discount');
$($('.top_right')[1]).addClass('d3');
}
});
},
open:function (_this) {
if (_this)
{
$('#discount_offer').show();
$('#discount').hide();
offer_id = $(_this).attr('data-offer-id');
$('#discount_offer_id').val(offer_id);
}else
{
$('#discount').show();
$('#discount_offer').hide();
$('#discount_offer_id').val('');
}
var discountForm = $('.discount_form');
discountForm.removeClass('discount_form_done');
$('.overlay_discount').addClass('overlay_discount_active');
$('body').addClass('scroll_hidden');
$('body').addClass('overlay_discount_active');
discountForm.find('input[type="text"]').eq(0).focus();
},
close: function(){
$('.overlay_discount').removeClass('overlay_discount_active');
$('body').removeClass('scroll_hidden');
$('body').removeClass('overlay_discount_active');
}
};
var callback = { var callback = {
submit: function(form){ submit: function(form){
form = $(form); form = $(form);
...@@ -2808,9 +2849,24 @@ var form_validator = { ...@@ -2808,9 +2849,24 @@ var form_validator = {
function setUrlHash(hash) { function setUrlHash(hash) {
if ('replaceState' in window.history && window.location.hash !== hash) window.history.replaceState('', '', hash); if ('replaceState' in window.history && window.location.hash !== hash) window.history.replaceState('', '', hash);
} }
$(document).ready(function () { $(document).ready(function () {
//slider.init(); $.ajax({
if ($('.phone_mask').length > 0) { url: '/check_discount_term/',
$('.phone_mask').mask("+7 (999) 999-9999"); dataType: 'json',
type: 'post',
success: function (data) {
if (data.status == 'success' && data.active_discount != 0) {
console.log('123');
if ($(window).width() < 650) {
$('.header_mobile').addClass('discount');
$('.header_mobile').addClass('d' + data.active_discount);
} else {
$($('.top_right')[1]).addClass('discount');
$($('.top_right')[1]).addClass('d' + data.active_discount);
}
} }
}
})
}); });
web/robots.txt deleted 100644 → 0
User-agent: *
Allow: /i/
Disallow: /js/
Disallow: /css/
Disallow: /a/
User-agent: Googlebot
Allow: /
User-agent: Yandex
Allow: /i/
Disallow: /js/
Disallow: /css/
Disallow: /a/
Host: idivbanu.ru
Sitemap: http://idivbanu.ru/sitemap.xml
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment