update prod
This commit is contained in:
PLESK5
parent
70884dcea0
commit
46978baba5
35
cache/cachefs/index.php
vendored
35
cache/cachefs/index.php
vendored
@ -1,35 +0,0 @@
|
||||
<?php
|
||||
/*
|
||||
* 2007-2014 PrestaShop
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Open Software License (OSL 3.0)
|
||||
* that is bundled with this package in the file LICENSE.txt.
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* http://opensource.org/licenses/osl-3.0.php
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to license@prestashop.com so we can send you a copy immediately.
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2014 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*/
|
||||
|
||||
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
|
||||
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
|
||||
|
||||
header("Cache-Control: no-store, no-cache, must-revalidate");
|
||||
header("Cache-Control: post-check=0, pre-check=0", false);
|
||||
header("Pragma: no-cache");
|
||||
|
||||
header("Location: ../");
|
||||
exit;
|
||||
BIN
cache/purifier/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser
vendored
Normal file
BIN
cache/purifier/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser
vendored
Normal file
Binary file not shown.
@ -279,6 +279,7 @@ class AdminPaymentControllerCore extends AdminController
|
||||
{
|
||||
if ($this->getModulesList($this->filter_modules_list)) {
|
||||
$active_list = array();
|
||||
$unactive_list = array();
|
||||
foreach ($this->modules_list as $key => $module) {
|
||||
if (in_array($module->name, $this->list_partners_modules)) {
|
||||
$this->modules_list[$key]->type = 'addonsPartner';
|
||||
|
||||
@ -82,7 +82,7 @@ class ParentOrderControllerCore extends FrontController
|
||||
$duplication = $oldCart->duplicate();
|
||||
if (!$duplication || !Validate::isLoadedObject($duplication['cart'])) {
|
||||
$this->errors[] = Tools::displayError('Sorry. We cannot renew your order.');
|
||||
} elseif (!$duplication['success']) {
|
||||
} elseif (!$duplication['success']) {
|
||||
$this->errors[] = Tools::displayError('Some items are no longer available, and we are unable to renew your order.');
|
||||
} else {
|
||||
$this->context->cookie->id_cart = $duplication['cart']->id;
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
<?php
|
||||
error_reporting(E_ALL);
|
||||
ini_set('display_errors', 1);
|
||||
|
||||
// Vendors
|
||||
require_once 'ripcord/ripcord.php';
|
||||
require '../config/config.inc.php';
|
||||
require 'ErpTools.php';
|
||||
require 'config.php';
|
||||
|
||||
if (empty($_GET['token']) || $_GET['token'] !== ERP_SCRIPT_TOKEN) {
|
||||
die;
|
||||
}
|
||||
|
||||
// date de diff pour la création de client
|
||||
$date_since_import = new DateTime();
|
||||
$date_since_import->modify('-1 day');
|
||||
|
||||
// Get All Customers with email and is customer to create if no exist or update info
|
||||
$models = ripcord::client("$url/xmlrpc/2/object");
|
||||
|
||||
$ids_company = $models->execute_kw($db, $uid, $password,
|
||||
'res.partner', 'search', array(
|
||||
array(
|
||||
array('email', '!=', ''),
|
||||
array('is_company', '=', true),
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
|
||||
$final = array();
|
||||
|
||||
|
||||
$companys = $models->execute_kw($db, $uid, $password,
|
||||
'res.partner', 'read', array($ids_company));
|
||||
|
||||
foreach ($companys as $key => $company) {
|
||||
$addrs = $models->execute_kw($db, $uid, $password,
|
||||
'res.partner', 'read', array($company['child_ids']));
|
||||
|
||||
foreach ($addrs as $key => $addr) {
|
||||
$final[] = array(
|
||||
'company_id_erp' => $company['id'],
|
||||
'addr' => $addr
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
foreach ($final as $key => $item) {
|
||||
$customer = Customer::getCustomerIdByIdErp($item['company_id_erp']);
|
||||
|
||||
if (!$customer || empty($customer->id)) { continue; }
|
||||
|
||||
$address = Address::getByErp($item['addr']['id']);
|
||||
|
||||
$phone = $item['addr']['phone'];
|
||||
if (empty($phone)) {
|
||||
$phone = '0000000000';
|
||||
}
|
||||
|
||||
if (empty($item['addr']['country_id'])
|
||||
|| empty($item['addr']['street'])
|
||||
|| empty($item['addr']['city'])
|
||||
|| empty($item['addr']['zip'])) {
|
||||
|
||||
ErpTools::logError($item['addr'], 'erp_update_address | odoo address is not valid');
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$address->id_customer = $customer->id;
|
||||
$address->alias = $item['addr']['name'];
|
||||
$address->lastname = $customer->lastname;
|
||||
$address->firstname = $customer->firstname;
|
||||
$address->address1 = utf8_encode($item['addr']['street']);
|
||||
$address->address2 = utf8_encode($item['addr']['street2']);
|
||||
$address->city = utf8_encode($item['addr']['city']);
|
||||
$address->postcode = $item['addr']['zip'];
|
||||
$address->company = $item['addr']['display_name'];
|
||||
$address->phone = (int)str_replace(' ', '', $phone);
|
||||
$address->id_country = ErpTools::getCountryIdForPresta($item['addr']['country_id'][0]);
|
||||
$address->is_erp = 1;
|
||||
$address->id_erp = $item['addr']['id'];
|
||||
$address->save();
|
||||
}
|
||||
150
modules/be2bill/views/img/1-front.svg
Normal file
150
modules/be2bill/views/img/1-front.svg
Normal file
@ -0,0 +1,150 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 88 45" style="enable-background:new 0 0 88 45;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:url(#SVGID_1_);}
|
||||
.st1{fill:#FFFFFF;}
|
||||
.st2{fill:#ED8415;}
|
||||
.st3{fill:#E11B25;}
|
||||
.st4{fill:#1C336D;}
|
||||
.st5{display:none;}
|
||||
.st6{fill:#005198;}
|
||||
.st7{fill:#F6A70F;}
|
||||
</style>
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="63.078" y1="-52.084" x2="64.104" y2="-52.084" gradientTransform="matrix(0 26.9963 0.8337 0 87.4224 -1702.8738)">
|
||||
<stop offset="0" style="stop-color:#1C2046"/>
|
||||
<stop offset="0.3515" style="stop-color:#1C2046"/>
|
||||
<stop offset="0.4737" style="stop-color:#2F4780"/>
|
||||
<stop offset="0.5515" style="stop-color:#3A66AA"/>
|
||||
<stop offset="0.5925" style="stop-color:#3A66A9"/>
|
||||
<stop offset="0.6315" style="stop-color:#3966A2"/>
|
||||
<stop offset="0.6697" style="stop-color:#36669A"/>
|
||||
<stop offset="0.7074" style="stop-color:#32678D"/>
|
||||
<stop offset="0.7448" style="stop-color:#33677B"/>
|
||||
<stop offset="0.7819" style="stop-color:#2B6764"/>
|
||||
<stop offset="0.8181" style="stop-color:#27654A"/>
|
||||
<stop offset="0.8485" style="stop-color:#246332"/>
|
||||
<stop offset="1" style="stop-color:#246332"/>
|
||||
</linearGradient>
|
||||
<polygon class="st0" points="25.2,27.7 25.2,0 62.8,0 62.8,27.7 "/>
|
||||
<path class="st1" d="M36.7,13.2h8.1c-0.1-1.6-0.5-3.2-1.7-4.3c-1.5-1.3-4-1.7-6.3-1.7c-2.4,0-5,0.5-6.5,1.9c-1.3,1.2-1.5,3-1.5,4.7
|
||||
c0,1.8,0.5,3.8,1.9,5c1.5,1.3,3.8,1.6,6.1,1.6c2.2,0,4.6-0.4,6.1-1.6c1.5-1.2,2-3.2,2-5c0,0,0,0,0,0h-8.1V13.2z"/>
|
||||
<path class="st1" d="M45.3,13.8v6.3h11.2v0c1.6-0.1,2.9-1.4,2.9-3.1c0-1.7-1.3-3.1-2.9-3.2v0L45.3,13.8L45.3,13.8z"/>
|
||||
<path class="st1" d="M59.3,10.4c0-1.6-1.3-2.9-2.9-2.9c-0.1,0-0.2,0-0.4,0H45.3v5.8h11.3C58.1,13.1,59.3,11.9,59.3,10.4z"/>
|
||||
<g>
|
||||
<path class="st2" d="M32.1,37c0-2.8,2.3-5.2,5.2-5.2c2.8,0,5.2,2.3,5.2,5.2c0,2.8-2.3,5.2-5.2,5.2C34.5,42.2,32.1,39.9,32.1,37
|
||||
L32.1,37z"/>
|
||||
<path class="st3" d="M33.9,33.2c0,0-0.3,0.2-0.5,0.5h0.9c0,0,0.3,0.3,0.4,0.6H33c0,0-0.2,0.3-0.3,0.5H35c0,0,0.2,0.4,0.3,0.6h-2.9
|
||||
c0,0-0.1,0.3-0.1,0.5l3.2,0c0.1,0.4,0.3,1.5-0.1,2.8l-2.9,0c0,0.2,0.1,0.4,0.2,0.5h2.5c-0.1,0.2-0.2,0.5-0.3,0.6l-1.8,0
|
||||
c0.1,0.1,0.2,0.4,0.3,0.5l1.1,0c-0.2,0.3-0.6,0.6-0.6,0.6h0l0,0c-0.9,0.8-2.1,1.3-3.4,1.3c-2.8,0-5.2-2.3-5.2-5.2
|
||||
c0-2.8,2.3-5.2,5.2-5.2C31.7,31.9,32.9,32.4,33.9,33.2L33.9,33.2z"/>
|
||||
<path class="st4" d="M31.3,36.3l-0.1,0.5l-0.5,0c0,0-0.2,0.1-0.2,0.2c0,0.1,0.2,0.2,0.4,0.3c0.3,0.1,0.3,0.4,0.2,0.6
|
||||
c0,0.2-0.1,0.6-0.8,0.6c-0.4,0-0.6-0.1-0.6-0.1l0.1-0.5c0,0,0.5,0.1,0.7,0.1c0.1-0.1,0.3-0.2,0-0.3C30.3,37.6,30,37.4,30,37
|
||||
c0-0.4,0.2-0.6,0.4-0.7C30.6,36.2,31,36.2,31.3,36.3L31.3,36.3z"/>
|
||||
<polygon class="st4" points="27.7,38.4 27.2,38.4 27.5,36.6 26.9,38.4 26.5,38.4 26.4,36.5 26.1,38.4 25.6,38.4 26.1,35.7
|
||||
26.7,35.7 26.9,37.2 27.6,35.7 28.2,35.7 "/>
|
||||
<path class="st4" d="M31.8,38.5c-0.2,0-0.3,0-0.4-0.1c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1l0.3-1.8h0.5
|
||||
l-0.1,0.3h0.5l-0.1,0.4H32l-0.1,0.8c0,0,0,0.1,0,0.2c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0.1,0,0.1,0h0l-0.1,0.4c-0.1,0-0.1,0-0.2,0C31.9,38.5,31.9,38.5,31.8,38.5L31.8,38.5z"/>
|
||||
<path class="st4" d="M35.3,36.9c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1H35l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C35.5,36.3,35.3,36.6,35.3,36.9L35.3,36.9z"/>
|
||||
<path class="st4" d="M36.3,38.5c-0.3,0-0.5-0.1-0.6-0.3c-0.2-0.2-0.2-0.4-0.2-0.8c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.4,0.3-0.6
|
||||
c0.1-0.2,0.2-0.3,0.4-0.4c0.2-0.1,0.3-0.1,0.5-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0,0.2,0.1,0.2,0.1l-0.1,0.7c-0.1-0.1-0.1-0.1-0.2-0.2
|
||||
c-0.1-0.1-0.2-0.1-0.3-0.1c-0.2,0-0.4,0.1-0.5,0.3c-0.1,0.2-0.2,0.5-0.2,0.8c0,0.2,0,0.4,0.1,0.5c0.1,0.1,0.2,0.1,0.3,0.1
|
||||
c0.1,0,0.2,0,0.4-0.1c0.1,0,0.1-0.1,0.2-0.1l-0.1,0.6c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0.1C36.4,38.5,36.4,38.5,36.3,38.5
|
||||
L36.3,38.5z"/>
|
||||
<path class="st4" d="M28.9,38.3C28.9,38.4,28.9,38.4,28.9,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1l0.1,0c0.1,0,0.2,0,0.4,0
|
||||
c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5
|
||||
c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1
|
||||
c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C29.1,38.2,29.1,38.3,28.9,38.3C29,38.3,29,38.3,28.9,38.3L28.9,38.3z M28.9,37.5
|
||||
c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
|
||||
c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C29.2,37.4,29.1,37.5,28.9,37.5C29,37.5,29,37.5,28.9,37.5L28.9,37.5z"/>
|
||||
<path class="st4" d="M33.2,36.7c-0.1,0-0.1,0-0.2,0.1c-0.1,0.1-0.1,0.2-0.2,0.3h0.3h0.3c0,0,0,0,0-0.1c0,0,0,0,0-0.1
|
||||
c0-0.1,0-0.2-0.1-0.2C33.4,36.7,33.4,36.7,33.2,36.7C33.3,36.7,33.2,36.7,33.2,36.7L33.2,36.7z M33.2,38L33.2,38
|
||||
c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.2-0.2h0.1l-0.1,0.5c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.3,0h0c-0.3,0-0.5-0.1-0.6-0.2
|
||||
c-0.1-0.2-0.2-0.4-0.2-0.6c0-0.2,0-0.4,0.1-0.5c0-0.2,0.1-0.3,0.2-0.4c0.1-0.1,0.2-0.2,0.3-0.3c0.1,0,0.2-0.1,0.3-0.1
|
||||
c0,0,0.1,0,0.1,0c0.2,0,0.4,0.1,0.5,0.2C34,36.6,34,36.8,34,37c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2h-0.8h-0.4v0v0
|
||||
c0,0.1,0,0.3,0.1,0.3C33,37.9,33.1,38,33.2,38L33.2,38z"/>
|
||||
<path class="st4" d="M37.8,38.3C37.8,38.4,37.8,38.4,37.8,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1c0,0,0.1,0,0.1,0
|
||||
c0.1,0,0.2,0,0.4,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1
|
||||
c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1
|
||||
c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1l-0.2,1.4H38l0-0.2C38,38.2,37.9,38.3,37.8,38.3L37.8,38.3L37.8,38.3z
|
||||
M37.8,37.5c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C38,37.4,38,37.5,37.8,37.5C37.9,37.5,37.9,37.5,37.8,37.5L37.8,37.5z"/>
|
||||
<path class="st4" d="M39.9,36.9c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C40.1,36.3,39.9,36.6,39.9,36.9L39.9,36.9z"/>
|
||||
<path class="st4" d="M40.9,36.8C40.9,36.8,40.8,36.8,40.9,36.8c-0.1,0.1-0.2,0.2-0.2,0.2c0,0.1-0.1,0.2-0.1,0.3c0,0.1,0,0.2,0,0.3
|
||||
c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.2,0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1l0.2-1c0,0-0.1,0-0.1,0
|
||||
c0,0-0.1,0-0.1,0C41,36.8,40.9,36.8,40.9,36.8L40.9,36.8z M40.9,38.3c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0.1c0,0-0.1,0-0.1,0
|
||||
c-0.2,0-0.3-0.1-0.4-0.2C40.1,38.1,40,38,40,37.7c0-0.2,0-0.4,0.1-0.6c0-0.2,0.1-0.3,0.2-0.5c0.1-0.1,0.2-0.2,0.3-0.3
|
||||
c0.1-0.1,0.2-0.1,0.3-0.1h0c0.1,0,0.2,0,0.2,0c0.1,0,0.1,0.1,0.2,0.1l0.1-0.7h0.5l-0.5,2.7H41l0-0.2C41,38.2,40.9,38.3,40.9,38.3
|
||||
L40.9,38.3z"/>
|
||||
<path class="st1" d="M31.4,36.2l-0.1,0.5l-0.5,0c0,0-0.2,0.1-0.2,0.2c0,0.1,0.2,0.2,0.4,0.3c0.3,0.1,0.3,0.4,0.2,0.6
|
||||
c0,0.2-0.1,0.6-0.8,0.6c-0.4,0-0.6-0.1-0.6-0.1l0.1-0.5c0,0,0.5,0.1,0.7,0.1c0.1-0.1,0.3-0.2,0-0.3c-0.2-0.1-0.6-0.3-0.6-0.6
|
||||
c0-0.4,0.2-0.6,0.4-0.7C30.7,36.1,31.1,36.2,31.4,36.2L31.4,36.2z"/>
|
||||
<polygon class="st1" points="27.8,38.3 27.3,38.3 27.6,36.5 27,38.3 26.6,38.3 26.5,36.5 26.2,38.3 25.7,38.3 26.2,35.6 26.8,35.6
|
||||
27,37.2 27.7,35.6 28.3,35.6 "/>
|
||||
<path class="st1" d="M31.9,38.4c-0.2,0-0.3,0-0.4-0.1c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1l0.3-1.8h0.5
|
||||
l-0.1,0.3h0.5l-0.1,0.4h-0.5L32,37.5c0,0,0,0.1,0,0.2c0,0.1,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0.1,0,0.1,0h0l-0.1,0.4c-0.1,0-0.1,0-0.2,0C32,38.4,32,38.4,31.9,38.4L31.9,38.4z"/>
|
||||
<path class="st1" d="M35.4,36.8c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C35.6,36.3,35.4,36.6,35.4,36.8L35.4,36.8z"/>
|
||||
<path class="st1" d="M36.3,38.4c-0.3,0-0.5-0.1-0.6-0.3c-0.2-0.2-0.2-0.4-0.2-0.8c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.4,0.3-0.6
|
||||
c0.1-0.2,0.2-0.3,0.4-0.4c0.2-0.1,0.3-0.1,0.5-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0,0.2,0.1,0.2,0.1l-0.1,0.7c-0.1-0.1-0.1-0.1-0.2-0.2
|
||||
c-0.1-0.1-0.2-0.1-0.3-0.1c-0.2,0-0.4,0.1-0.5,0.3c-0.1,0.2-0.2,0.5-0.2,0.8c0,0.2,0,0.4,0.1,0.5c0.1,0.1,0.2,0.1,0.3,0.1
|
||||
c0.1,0,0.2,0,0.4-0.1c0.1,0,0.1-0.1,0.2-0.1l-0.1,0.6c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0.1C36.5,38.4,36.5,38.4,36.3,38.4
|
||||
L36.3,38.4z"/>
|
||||
<path class="st1" d="M29,38.3C29,38.3,29,38.3,29,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1l0.1,0c0.1,0,0.2,0,0.4,0
|
||||
c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5
|
||||
c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1
|
||||
c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C29.2,38.2,29.2,38.2,29,38.3C29.1,38.2,29.1,38.3,29,38.3L29,38.3z M29,37.4
|
||||
c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
|
||||
c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C29.3,37.4,29.2,37.4,29,37.4C29.1,37.4,29.1,37.4,29,37.4L29,37.4z"/>
|
||||
<path class="st1" d="M33.3,36.6c-0.1,0-0.1,0-0.2,0.1C33.1,36.8,33,36.9,33,37h0.3h0.3c0,0,0,0,0-0.1c0,0,0,0,0-0.1
|
||||
c0-0.1,0-0.2-0.1-0.2C33.5,36.6,33.5,36.6,33.3,36.6C33.4,36.6,33.3,36.6,33.3,36.6L33.3,36.6z M33.3,37.9L33.3,37.9
|
||||
c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.2-0.2H34l-0.1,0.5c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.3,0h0c-0.3,0-0.5-0.1-0.6-0.2
|
||||
c-0.1-0.2-0.2-0.4-0.2-0.6c0-0.2,0-0.4,0.1-0.5c0-0.2,0.1-0.3,0.2-0.4c0.1-0.1,0.2-0.2,0.3-0.3c0.1,0,0.2-0.1,0.3-0.1
|
||||
c0,0,0.1,0,0.1,0c0.2,0,0.4,0.1,0.5,0.2c0.1,0.1,0.2,0.3,0.2,0.6c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2h-0.8h-0.4v0v0
|
||||
c0,0.1,0,0.3,0.1,0.3C33.1,37.9,33.2,37.9,33.3,37.9L33.3,37.9z"/>
|
||||
<path class="st1" d="M37.9,38.3C37.9,38.3,37.9,38.3,37.9,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1c0,0,0.1,0,0.1,0
|
||||
c0.1,0,0.2,0,0.4,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1
|
||||
c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1
|
||||
c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C38.1,38.2,38,38.2,37.9,38.3L37.9,38.3L37.9,38.3z
|
||||
M37.9,37.4c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C38.1,37.4,38.1,37.4,37.9,37.4C38,37.4,37.9,37.4,37.9,37.4L37.9,37.4z"/>
|
||||
<path class="st1" d="M40,36.8c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C40.2,36.3,40,36.6,40,36.8L40,36.8z"/>
|
||||
<path class="st1" d="M41,36.7C41,36.7,40.9,36.7,41,36.7c-0.1,0.1-0.2,0.2-0.2,0.2c0,0.1-0.1,0.2-0.1,0.3c0,0.1,0,0.2,0,0.3
|
||||
c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.2,0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1l0.2-1c0,0-0.1,0-0.1,0
|
||||
c0,0-0.1,0-0.1,0C41.1,36.7,41,36.7,41,36.7L41,36.7z M41,38.2c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0.1c0,0-0.1,0-0.1,0
|
||||
c-0.2,0-0.3-0.1-0.4-0.2c-0.1-0.1-0.1-0.3-0.1-0.6c0-0.2,0-0.4,0.1-0.6c0-0.2,0.1-0.3,0.2-0.5c0.1-0.1,0.2-0.2,0.3-0.3
|
||||
c0.1-0.1,0.2-0.1,0.3-0.1h0c0.1,0,0.2,0,0.2,0c0.1,0,0.1,0.1,0.2,0.1l0.1-0.7H42l-0.5,2.7h-0.5l0-0.2C41.1,38.2,41,38.2,41,38.2
|
||||
L41,38.2z"/>
|
||||
</g>
|
||||
<g id="Grid" class="st5">
|
||||
</g>
|
||||
<g id="Layer_1">
|
||||
</g>
|
||||
<g id="Desktop">
|
||||
</g>
|
||||
<g id="Guides">
|
||||
</g>
|
||||
<g id="Page_1">
|
||||
<g id="Layer_1_1_">
|
||||
<polygon class="st6" points="51,39.4 52,34 53.4,34 52.5,39.4 "/>
|
||||
<path class="st6" d="M57.9,34.1c-0.3-0.1-0.8-0.2-1.3-0.2c-1.5,0-2.5,0.7-2.5,1.8c0,0.8,0.7,1.2,1.3,1.5c0.6,0.3,0.8,0.4,0.8,0.7
|
||||
c0,0.4-0.5,0.5-0.9,0.5c-0.6,0-0.9-0.1-1.4-0.3L53.6,38l-0.2,1.2c0.3,0.2,1,0.3,1.6,0.3c1.6,0,2.6-0.7,2.6-1.9
|
||||
c0-0.6-0.4-1.1-1.2-1.5c-0.5-0.2-0.8-0.4-0.8-0.7c0-0.2,0.3-0.5,0.8-0.5c0.5,0,0.8,0.1,1.1,0.2l0.1,0.1L57.9,34.1L57.9,34.1z"/>
|
||||
<path class="st6" d="M61.7,34h-1.1c-0.4,0-0.6,0.1-0.8,0.4l-2.2,5h1.5c0,0,0.3-0.7,0.3-0.8c0.2,0,1.7,0,1.9,0
|
||||
c0,0.2,0.2,0.8,0.2,0.8h1.4L61.7,34L61.7,34z M59.8,37.5c0.1-0.3,0.6-1.5,0.6-1.5c0,0,0.1-0.3,0.2-0.5l0.1,0.5
|
||||
c0,0,0.3,1.3,0.3,1.6L59.8,37.5L59.8,37.5z"/>
|
||||
<path class="st6" d="M49.8,34l-1.5,3.7l-0.1-0.7c-0.3-0.9-1.1-1.8-2.1-2.3l1.3,4.7H49l2.3-5.4H49.8L49.8,34z"/>
|
||||
<path class="st7" d="M47,34h-2.4l0,0.1c1.8,0.4,3.1,1.5,3.6,2.8l-0.5-2.5C47.6,34.1,47.3,34,47,34L47,34z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 12 KiB |
150
modules/be2bill/views/img/1.svg
Normal file
150
modules/be2bill/views/img/1.svg
Normal file
@ -0,0 +1,150 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 88 45" style="enable-background:new 0 0 88 45;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:url(#SVGID_1_);}
|
||||
.st1{fill:#FFFFFF;}
|
||||
.st2{fill:#ED8415;}
|
||||
.st3{fill:#E11B25;}
|
||||
.st4{fill:#1C336D;}
|
||||
.st5{display:none;}
|
||||
.st6{fill:#005198;}
|
||||
.st7{fill:#F6A70F;}
|
||||
</style>
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="63.078" y1="-52.084" x2="64.104" y2="-52.084" gradientTransform="matrix(0 26.9963 0.8337 0 87.4224 -1702.8738)">
|
||||
<stop offset="0" style="stop-color:#1C2046"/>
|
||||
<stop offset="0.3515" style="stop-color:#1C2046"/>
|
||||
<stop offset="0.4737" style="stop-color:#2F4780"/>
|
||||
<stop offset="0.5515" style="stop-color:#3A66AA"/>
|
||||
<stop offset="0.5925" style="stop-color:#3A66A9"/>
|
||||
<stop offset="0.6315" style="stop-color:#3966A2"/>
|
||||
<stop offset="0.6697" style="stop-color:#36669A"/>
|
||||
<stop offset="0.7074" style="stop-color:#32678D"/>
|
||||
<stop offset="0.7448" style="stop-color:#33677B"/>
|
||||
<stop offset="0.7819" style="stop-color:#2B6764"/>
|
||||
<stop offset="0.8181" style="stop-color:#27654A"/>
|
||||
<stop offset="0.8485" style="stop-color:#246332"/>
|
||||
<stop offset="1" style="stop-color:#246332"/>
|
||||
</linearGradient>
|
||||
<polygon class="st0" points="25.2,27.7 25.2,0 62.8,0 62.8,27.7 "/>
|
||||
<path class="st1" d="M36.7,13.2h8.1c-0.1-1.6-0.5-3.2-1.7-4.3c-1.5-1.3-4-1.7-6.3-1.7c-2.4,0-5,0.5-6.5,1.9c-1.3,1.2-1.5,3-1.5,4.7
|
||||
c0,1.8,0.5,3.8,1.9,5c1.5,1.3,3.8,1.6,6.1,1.6c2.2,0,4.6-0.4,6.1-1.6c1.5-1.2,2-3.2,2-5c0,0,0,0,0,0h-8.1V13.2z"/>
|
||||
<path class="st1" d="M45.3,13.8v6.3h11.2v0c1.6-0.1,2.9-1.4,2.9-3.1c0-1.7-1.3-3.1-2.9-3.2v0L45.3,13.8L45.3,13.8z"/>
|
||||
<path class="st1" d="M59.3,10.4c0-1.6-1.3-2.9-2.9-2.9c-0.1,0-0.2,0-0.4,0H45.3v5.8h11.3C58.1,13.1,59.3,11.9,59.3,10.4z"/>
|
||||
<g>
|
||||
<path class="st2" d="M32.1,37c0-2.8,2.3-5.2,5.2-5.2c2.8,0,5.2,2.3,5.2,5.2c0,2.8-2.3,5.2-5.2,5.2C34.5,42.2,32.1,39.9,32.1,37
|
||||
L32.1,37z"/>
|
||||
<path class="st3" d="M33.9,33.2c0,0-0.3,0.2-0.5,0.5h0.9c0,0,0.3,0.3,0.4,0.6H33c0,0-0.2,0.3-0.3,0.5H35c0,0,0.2,0.4,0.3,0.6h-2.9
|
||||
c0,0-0.1,0.3-0.1,0.5l3.2,0c0.1,0.4,0.3,1.5-0.1,2.8l-2.9,0c0,0.2,0.1,0.4,0.2,0.5h2.5c-0.1,0.2-0.2,0.5-0.3,0.6l-1.8,0
|
||||
c0.1,0.1,0.2,0.4,0.3,0.5l1.1,0c-0.2,0.3-0.6,0.6-0.6,0.6h0l0,0c-0.9,0.8-2.1,1.3-3.4,1.3c-2.8,0-5.2-2.3-5.2-5.2
|
||||
c0-2.8,2.3-5.2,5.2-5.2C31.7,31.9,32.9,32.4,33.9,33.2L33.9,33.2z"/>
|
||||
<path class="st4" d="M31.3,36.3l-0.1,0.5l-0.5,0c0,0-0.2,0.1-0.2,0.2c0,0.1,0.2,0.2,0.4,0.3c0.3,0.1,0.3,0.4,0.2,0.6
|
||||
c0,0.2-0.1,0.6-0.8,0.6c-0.4,0-0.6-0.1-0.6-0.1l0.1-0.5c0,0,0.5,0.1,0.7,0.1c0.1-0.1,0.3-0.2,0-0.3C30.3,37.6,30,37.4,30,37
|
||||
c0-0.4,0.2-0.6,0.4-0.7C30.6,36.2,31,36.2,31.3,36.3L31.3,36.3z"/>
|
||||
<polygon class="st4" points="27.7,38.4 27.2,38.4 27.5,36.6 26.9,38.4 26.5,38.4 26.4,36.5 26.1,38.4 25.6,38.4 26.1,35.7
|
||||
26.7,35.7 26.9,37.2 27.6,35.7 28.2,35.7 "/>
|
||||
<path class="st4" d="M31.8,38.5c-0.2,0-0.3,0-0.4-0.1c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1l0.3-1.8h0.5
|
||||
l-0.1,0.3h0.5l-0.1,0.4H32l-0.1,0.8c0,0,0,0.1,0,0.2c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0.1,0,0.1,0h0l-0.1,0.4c-0.1,0-0.1,0-0.2,0C31.9,38.5,31.9,38.5,31.8,38.5L31.8,38.5z"/>
|
||||
<path class="st4" d="M35.3,36.9c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1H35l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C35.5,36.3,35.3,36.6,35.3,36.9L35.3,36.9z"/>
|
||||
<path class="st4" d="M36.3,38.5c-0.3,0-0.5-0.1-0.6-0.3c-0.2-0.2-0.2-0.4-0.2-0.8c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.4,0.3-0.6
|
||||
c0.1-0.2,0.2-0.3,0.4-0.4c0.2-0.1,0.3-0.1,0.5-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0,0.2,0.1,0.2,0.1l-0.1,0.7c-0.1-0.1-0.1-0.1-0.2-0.2
|
||||
c-0.1-0.1-0.2-0.1-0.3-0.1c-0.2,0-0.4,0.1-0.5,0.3c-0.1,0.2-0.2,0.5-0.2,0.8c0,0.2,0,0.4,0.1,0.5c0.1,0.1,0.2,0.1,0.3,0.1
|
||||
c0.1,0,0.2,0,0.4-0.1c0.1,0,0.1-0.1,0.2-0.1l-0.1,0.6c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0.1C36.4,38.5,36.4,38.5,36.3,38.5
|
||||
L36.3,38.5z"/>
|
||||
<path class="st4" d="M28.9,38.3C28.9,38.4,28.9,38.4,28.9,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1l0.1,0c0.1,0,0.2,0,0.4,0
|
||||
c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5
|
||||
c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1
|
||||
c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C29.1,38.2,29.1,38.3,28.9,38.3C29,38.3,29,38.3,28.9,38.3L28.9,38.3z M28.9,37.5
|
||||
c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
|
||||
c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C29.2,37.4,29.1,37.5,28.9,37.5C29,37.5,29,37.5,28.9,37.5L28.9,37.5z"/>
|
||||
<path class="st4" d="M33.2,36.7c-0.1,0-0.1,0-0.2,0.1c-0.1,0.1-0.1,0.2-0.2,0.3h0.3h0.3c0,0,0,0,0-0.1c0,0,0,0,0-0.1
|
||||
c0-0.1,0-0.2-0.1-0.2C33.4,36.7,33.4,36.7,33.2,36.7C33.3,36.7,33.2,36.7,33.2,36.7L33.2,36.7z M33.2,38L33.2,38
|
||||
c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.2-0.2h0.1l-0.1,0.5c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.3,0h0c-0.3,0-0.5-0.1-0.6-0.2
|
||||
c-0.1-0.2-0.2-0.4-0.2-0.6c0-0.2,0-0.4,0.1-0.5c0-0.2,0.1-0.3,0.2-0.4c0.1-0.1,0.2-0.2,0.3-0.3c0.1,0,0.2-0.1,0.3-0.1
|
||||
c0,0,0.1,0,0.1,0c0.2,0,0.4,0.1,0.5,0.2C34,36.6,34,36.8,34,37c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2h-0.8h-0.4v0v0
|
||||
c0,0.1,0,0.3,0.1,0.3C33,37.9,33.1,38,33.2,38L33.2,38z"/>
|
||||
<path class="st4" d="M37.8,38.3C37.8,38.4,37.8,38.4,37.8,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1c0,0,0.1,0,0.1,0
|
||||
c0.1,0,0.2,0,0.4,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1
|
||||
c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1
|
||||
c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1l-0.2,1.4H38l0-0.2C38,38.2,37.9,38.3,37.8,38.3L37.8,38.3L37.8,38.3z
|
||||
M37.8,37.5c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C38,37.4,38,37.5,37.8,37.5C37.9,37.5,37.9,37.5,37.8,37.5L37.8,37.5z"/>
|
||||
<path class="st4" d="M39.9,36.9c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C40.1,36.3,39.9,36.6,39.9,36.9L39.9,36.9z"/>
|
||||
<path class="st4" d="M40.9,36.8C40.9,36.8,40.8,36.8,40.9,36.8c-0.1,0.1-0.2,0.2-0.2,0.2c0,0.1-0.1,0.2-0.1,0.3c0,0.1,0,0.2,0,0.3
|
||||
c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.2,0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1l0.2-1c0,0-0.1,0-0.1,0
|
||||
c0,0-0.1,0-0.1,0C41,36.8,40.9,36.8,40.9,36.8L40.9,36.8z M40.9,38.3c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0.1c0,0-0.1,0-0.1,0
|
||||
c-0.2,0-0.3-0.1-0.4-0.2C40.1,38.1,40,38,40,37.7c0-0.2,0-0.4,0.1-0.6c0-0.2,0.1-0.3,0.2-0.5c0.1-0.1,0.2-0.2,0.3-0.3
|
||||
c0.1-0.1,0.2-0.1,0.3-0.1h0c0.1,0,0.2,0,0.2,0c0.1,0,0.1,0.1,0.2,0.1l0.1-0.7h0.5l-0.5,2.7H41l0-0.2C41,38.2,40.9,38.3,40.9,38.3
|
||||
L40.9,38.3z"/>
|
||||
<path class="st1" d="M31.4,36.2l-0.1,0.5l-0.5,0c0,0-0.2,0.1-0.2,0.2c0,0.1,0.2,0.2,0.4,0.3c0.3,0.1,0.3,0.4,0.2,0.6
|
||||
c0,0.2-0.1,0.6-0.8,0.6c-0.4,0-0.6-0.1-0.6-0.1l0.1-0.5c0,0,0.5,0.1,0.7,0.1c0.1-0.1,0.3-0.2,0-0.3c-0.2-0.1-0.6-0.3-0.6-0.6
|
||||
c0-0.4,0.2-0.6,0.4-0.7C30.7,36.1,31.1,36.2,31.4,36.2L31.4,36.2z"/>
|
||||
<polygon class="st1" points="27.8,38.3 27.3,38.3 27.6,36.5 27,38.3 26.6,38.3 26.5,36.5 26.2,38.3 25.7,38.3 26.2,35.6 26.8,35.6
|
||||
27,37.2 27.7,35.6 28.3,35.6 "/>
|
||||
<path class="st1" d="M31.9,38.4c-0.2,0-0.3,0-0.4-0.1c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1l0.3-1.8h0.5
|
||||
l-0.1,0.3h0.5l-0.1,0.4h-0.5L32,37.5c0,0,0,0.1,0,0.2c0,0.1,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0.1,0,0.1,0h0l-0.1,0.4c-0.1,0-0.1,0-0.2,0C32,38.4,32,38.4,31.9,38.4L31.9,38.4z"/>
|
||||
<path class="st1" d="M35.4,36.8c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C35.6,36.3,35.4,36.6,35.4,36.8L35.4,36.8z"/>
|
||||
<path class="st1" d="M36.3,38.4c-0.3,0-0.5-0.1-0.6-0.3c-0.2-0.2-0.2-0.4-0.2-0.8c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.4,0.3-0.6
|
||||
c0.1-0.2,0.2-0.3,0.4-0.4c0.2-0.1,0.3-0.1,0.5-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0,0.2,0.1,0.2,0.1l-0.1,0.7c-0.1-0.1-0.1-0.1-0.2-0.2
|
||||
c-0.1-0.1-0.2-0.1-0.3-0.1c-0.2,0-0.4,0.1-0.5,0.3c-0.1,0.2-0.2,0.5-0.2,0.8c0,0.2,0,0.4,0.1,0.5c0.1,0.1,0.2,0.1,0.3,0.1
|
||||
c0.1,0,0.2,0,0.4-0.1c0.1,0,0.1-0.1,0.2-0.1l-0.1,0.6c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.2,0.1C36.5,38.4,36.5,38.4,36.3,38.4
|
||||
L36.3,38.4z"/>
|
||||
<path class="st1" d="M29,38.3C29,38.3,29,38.3,29,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1l0.1,0c0.1,0,0.2,0,0.4,0
|
||||
c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5
|
||||
c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1
|
||||
c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C29.2,38.2,29.2,38.2,29,38.3C29.1,38.2,29.1,38.3,29,38.3L29,38.3z M29,37.4
|
||||
c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0,0,0.1,0c0,0,0,0,0.1,0
|
||||
c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C29.3,37.4,29.2,37.4,29,37.4C29.1,37.4,29.1,37.4,29,37.4L29,37.4z"/>
|
||||
<path class="st1" d="M33.3,36.6c-0.1,0-0.1,0-0.2,0.1C33.1,36.8,33,36.9,33,37h0.3h0.3c0,0,0,0,0-0.1c0,0,0,0,0-0.1
|
||||
c0-0.1,0-0.2-0.1-0.2C33.5,36.6,33.5,36.6,33.3,36.6C33.4,36.6,33.3,36.6,33.3,36.6L33.3,36.6z M33.3,37.9L33.3,37.9
|
||||
c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.2-0.2H34l-0.1,0.5c-0.1,0.1-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.3,0h0c-0.3,0-0.5-0.1-0.6-0.2
|
||||
c-0.1-0.2-0.2-0.4-0.2-0.6c0-0.2,0-0.4,0.1-0.5c0-0.2,0.1-0.3,0.2-0.4c0.1-0.1,0.2-0.2,0.3-0.3c0.1,0,0.2-0.1,0.3-0.1
|
||||
c0,0,0.1,0,0.1,0c0.2,0,0.4,0.1,0.5,0.2c0.1,0.1,0.2,0.3,0.2,0.6c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2h-0.8h-0.4v0v0
|
||||
c0,0.1,0,0.3,0.1,0.3C33.1,37.9,33.2,37.9,33.3,37.9L33.3,37.9z"/>
|
||||
<path class="st1" d="M37.9,38.3C37.9,38.3,37.9,38.3,37.9,38.3c-0.1,0.1-0.2,0.1-0.2,0.1c0,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1
|
||||
c-0.1-0.1-0.1-0.2-0.1-0.4c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.1-0.2,0.3-0.3c0.1-0.1,0.2-0.1,0.4-0.1c0,0,0.1,0,0.1,0
|
||||
c0.1,0,0.2,0,0.4,0c0,0,0,0,0,0c0,0,0,0,0-0.1c0-0.1,0-0.1-0.1-0.2c-0.1,0-0.2,0-0.3,0h0c-0.1,0-0.2,0-0.2,0.1
|
||||
c-0.1,0-0.2,0.1-0.2,0.1h0l0.1-0.5c0.1,0,0.1,0,0.3-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.2,0c0.2,0,0.4,0,0.5,0.1
|
||||
c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1l-0.2,1.4h-0.5l0-0.2C38.1,38.2,38,38.2,37.9,38.3L37.9,38.3L37.9,38.3z
|
||||
M37.9,37.4c-0.1,0-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0
|
||||
c0,0,0,0,0.1,0c0.1,0,0.1-0.1,0.2-0.1l0.1-0.4C38.1,37.4,38.1,37.4,37.9,37.4C38,37.4,37.9,37.4,37.9,37.4L37.9,37.4z"/>
|
||||
<path class="st1" d="M40,36.8c-0.1-0.1-0.3-0.1-0.4,0.1l-0.2,1.4h-0.5l0.4-2.1h0.5l0,0.2c0.1-0.1,0.2-0.2,0.5-0.2
|
||||
C40.2,36.3,40,36.6,40,36.8L40,36.8z"/>
|
||||
<path class="st1" d="M41,36.7C41,36.7,40.9,36.7,41,36.7c-0.1,0.1-0.2,0.2-0.2,0.2c0,0.1-0.1,0.2-0.1,0.3c0,0.1,0,0.2,0,0.3
|
||||
c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.2,0.1c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1-0.1,0.1-0.1l0.2-1c0,0-0.1,0-0.1,0
|
||||
c0,0-0.1,0-0.1,0C41.1,36.7,41,36.7,41,36.7L41,36.7z M41,38.2c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0.1c0,0-0.1,0-0.1,0
|
||||
c-0.2,0-0.3-0.1-0.4-0.2c-0.1-0.1-0.1-0.3-0.1-0.6c0-0.2,0-0.4,0.1-0.6c0-0.2,0.1-0.3,0.2-0.5c0.1-0.1,0.2-0.2,0.3-0.3
|
||||
c0.1-0.1,0.2-0.1,0.3-0.1h0c0.1,0,0.2,0,0.2,0c0.1,0,0.1,0.1,0.2,0.1l0.1-0.7H42l-0.5,2.7h-0.5l0-0.2C41.1,38.2,41,38.2,41,38.2
|
||||
L41,38.2z"/>
|
||||
</g>
|
||||
<g id="Grid" class="st5">
|
||||
</g>
|
||||
<g id="Layer_1">
|
||||
</g>
|
||||
<g id="Desktop">
|
||||
</g>
|
||||
<g id="Guides">
|
||||
</g>
|
||||
<g id="Page_1">
|
||||
<g id="Layer_1_1_">
|
||||
<polygon class="st6" points="51,39.4 52,34 53.4,34 52.5,39.4 "/>
|
||||
<path class="st6" d="M57.9,34.1c-0.3-0.1-0.8-0.2-1.3-0.2c-1.5,0-2.5,0.7-2.5,1.8c0,0.8,0.7,1.2,1.3,1.5c0.6,0.3,0.8,0.4,0.8,0.7
|
||||
c0,0.4-0.5,0.5-0.9,0.5c-0.6,0-0.9-0.1-1.4-0.3L53.6,38l-0.2,1.2c0.3,0.2,1,0.3,1.6,0.3c1.6,0,2.6-0.7,2.6-1.9
|
||||
c0-0.6-0.4-1.1-1.2-1.5c-0.5-0.2-0.8-0.4-0.8-0.7c0-0.2,0.3-0.5,0.8-0.5c0.5,0,0.8,0.1,1.1,0.2l0.1,0.1L57.9,34.1L57.9,34.1z"/>
|
||||
<path class="st6" d="M61.7,34h-1.1c-0.4,0-0.6,0.1-0.8,0.4l-2.2,5h1.5c0,0,0.3-0.7,0.3-0.8c0.2,0,1.7,0,1.9,0
|
||||
c0,0.2,0.2,0.8,0.2,0.8h1.4L61.7,34L61.7,34z M59.8,37.5c0.1-0.3,0.6-1.5,0.6-1.5c0,0,0.1-0.3,0.2-0.5l0.1,0.5
|
||||
c0,0,0.3,1.3,0.3,1.6L59.8,37.5L59.8,37.5z"/>
|
||||
<path class="st6" d="M49.8,34l-1.5,3.7l-0.1-0.7c-0.3-0.9-1.1-1.8-2.1-2.3l1.3,4.7H49l2.3-5.4H49.8L49.8,34z"/>
|
||||
<path class="st7" d="M47,34h-2.4l0,0.1c1.8,0.4,3.1,1.5,3.6,2.8l-0.5-2.5C47.6,34.1,47.3,34,47,34L47,34z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 12 KiB |
@ -1,197 +0,0 @@
|
||||
<?php
|
||||
/*
|
||||
* 2007-2015 PrestaShop
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Academic Free License (AFL 3.0)
|
||||
* that is bundled with this package in the file LICENSE.txt.
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* http://opensource.org/licenses/afl-3.0.php
|
||||
* If you did not receive a copy of the license and are unable to
|
||||
* obtain it through the world-wide-web, please send an email
|
||||
* to license@prestashop.com so we can send you a copy immediately.
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2015 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*/
|
||||
|
||||
if (!defined('_PS_VERSION_'))
|
||||
exit;
|
||||
|
||||
require 'newOrder.php';
|
||||
require _PS_ROOT_DIR_.'/erp/ripcord/ripcord.php';
|
||||
require _PS_ROOT_DIR_.'/erp/ErpTools.php';
|
||||
|
||||
class Erporder extends Module
|
||||
{
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->name = 'erporder';
|
||||
$this->tab = 'administration';
|
||||
$this->version = '1.0.0';
|
||||
$this->author = 'Antadis';
|
||||
|
||||
parent::__construct();
|
||||
$this->displayName = $this->l('Erp order');
|
||||
$this->description = $this->l('Sync order in Odoo');
|
||||
|
||||
$this->common = ripcord::client(ERP_URL.'/xmlrpc/2/common');
|
||||
$this->common->version();
|
||||
$this->uid = $this->common->authenticate(ERP_DB, ERP_USERNAME, ERP_PASSWORD, array());
|
||||
$this->model = ripcord::client(ERP_URL.'/xmlrpc/2/object');
|
||||
$this->report = ripcord::client(ERP_URL.'/xmlrpc/2/report');
|
||||
}
|
||||
|
||||
public function install()
|
||||
{
|
||||
return (parent::install()
|
||||
&& $this->registerHook('actionOrderStatusPostUpdate')
|
||||
&& $this->registerHook('actionPDFInvoiceRender')
|
||||
);
|
||||
}
|
||||
|
||||
public function hookActionOrderStatusPostUpdate($params)
|
||||
{
|
||||
global $cookie;
|
||||
|
||||
$order = new Order($params['id_order']);
|
||||
$cart = new Cart($cookie->id_cart);
|
||||
$newOrder = new NewOrder($this->model, $this->uid);
|
||||
$customer = new Customer($cookie->id_customer);
|
||||
$carrier = new Carrier($order->id_carrier);
|
||||
$isCB = ($order->current_state == 2);
|
||||
|
||||
$assoc_carrier = array(
|
||||
4 => 3,
|
||||
5 => 2
|
||||
);
|
||||
|
||||
$currency_ids = $newOrder->search('res.currency', array(array('name', '=', 'EUR')));
|
||||
$currency_id = $newOrder->read('res.currency', $currency_ids, 'id');
|
||||
|
||||
$newOrder->assignCurrency($currency_id);
|
||||
$newOrder->assignDate($order->date_add);
|
||||
$newOrder->assignReference($order->reference);
|
||||
$newOrder->assignCustomer($customer);
|
||||
$newOrder->assignInvoiceCustomer(new Address($order->id_address_invoice));
|
||||
$newOrder->assignShippingCustomer(new Address($order->id_address_delivery));
|
||||
$newOrder->assignCarrier((int)$assoc_carrier[$carrier->id]);
|
||||
$newOrder->assignState(NewOrder::ORDER_DRAFT);
|
||||
|
||||
$order_id = $newOrder->create('sale.order', $newOrder->order);
|
||||
|
||||
if (!empty($order_id['faultCode'])) {
|
||||
$a = array_merge($order_id, $newOrder->order);
|
||||
ErpTools::logError($a, 'insert into sale.order');
|
||||
}
|
||||
|
||||
|
||||
if ($isCB) {
|
||||
$history = new OrderHistory();
|
||||
$history->id_order = $params['id_order'];
|
||||
$history->id_employee = 0;
|
||||
$history->id_order_state = 3;
|
||||
$history->add();
|
||||
$history->changeIdOrderState($history->id_order_state, $order);
|
||||
}
|
||||
|
||||
foreach ($order->getProducts() as $key => $p) {
|
||||
$product = new Product($p['product_id']);
|
||||
$attr = $product->getAttributeCombinationsById($p['product_attribute_id'], (int)$cookie->lang)[0];
|
||||
|
||||
$res = $newOrder->search('product.product', array(array('id', '=', $attr['id_erp'])));
|
||||
$tax_id = $newOrder->read('product.product', $res, 'taxes_id');
|
||||
|
||||
$newOrder->assignLineProduct($key, $attr['id_erp']);
|
||||
$newOrder->assignLineName($key, $p['product_name']);
|
||||
$newOrder->assignLineOrder($key, $order_id);
|
||||
$newOrder->assignLineUnitPrice($key, $p['unit_price_tax_excl']);
|
||||
$newOrder->assignLineQuantity($key, $p['product_quantity']);
|
||||
$newOrder->assignLineTaxes($key, array(array(4, $tax_id[0], false)));
|
||||
|
||||
$line_id = $newOrder->create('sale.order.line', $newOrder->lines[$key]);
|
||||
if (!empty($line_id['faultCode'])) {
|
||||
$a = array_merge($line_id, $newOrder->order);
|
||||
ErpTools::logError($a, 'insert into sale.order.line');
|
||||
}
|
||||
}
|
||||
|
||||
/* if ($order->id_carrier == 5) {
|
||||
$linesLength = count($newOrder->lines);
|
||||
$shipping_ids = $newOrder->search('product.product', array(array('name', '=', 'Shipping')));
|
||||
$shipping_id = $newOrder->read('product.product', $shipping_ids, 'id');
|
||||
|
||||
$newOrder->assignLineOrder($linesLength, $order_id);
|
||||
$newOrder->assignLineProduct($linesLength, $shipping_id);
|
||||
$newOrder->assignLineName($linesLength, trim($carrier->name));
|
||||
$newOrder->assignLineQuantity($linesLength, 1);
|
||||
$newOrder->assignLineUnitPrice($linesLength, $order->total_shipping_tax_excl);
|
||||
$newOrder->assignLineTaxes($linesLength, array(array(4, 2, false)));
|
||||
|
||||
$line_id = $newOrder->create('sale.order.line', $newOrder->lines[$linesLength]);
|
||||
if (!empty($line_id['faultCode'])) {
|
||||
$a = array_merge($line_id, $newOrder->order);
|
||||
ErpTools::logError($a, 'insert into sale.order.line');
|
||||
}
|
||||
} */
|
||||
|
||||
$order->id_erp = (int)$order_id;
|
||||
$order->save();
|
||||
|
||||
}
|
||||
|
||||
public function hookActionPDFInvoiceRender($params)
|
||||
{
|
||||
global $cookie;
|
||||
|
||||
if (!Tools::getValue('id_order')) {
|
||||
die(Tools::displayError('Order was not found.'));
|
||||
}
|
||||
|
||||
$order = new Order(Tools::getValue('id_order'));
|
||||
$newOrder = new NewOrder($this->model, $this->uid);
|
||||
|
||||
if (!empty($cookie->id_customer)) {
|
||||
if ($cookie->id_customer != $order->id_customer) {
|
||||
die(Tools::displayError('The invoice was not found.'));
|
||||
}
|
||||
}
|
||||
|
||||
$order_erp = $newOrder->search('sale.order', array(
|
||||
array('id', '=', $order->id_erp)
|
||||
));
|
||||
$invoice_ids = $newOrder->read('sale.order', $order_erp, 'invoice_ids');
|
||||
|
||||
$result = $this->report->render_report(ERP_DB, $this->uid, ERP_PASSWORD, 'account.report_invoice', $invoice_ids);
|
||||
|
||||
$report_data = base64_decode($result['result']);
|
||||
|
||||
if (!empty($result['result'])) {
|
||||
$filename = $order->reference.'.pdf';
|
||||
$file = fopen($filename, 'w+');
|
||||
fwrite($file, $report_data);
|
||||
fclose($file);
|
||||
|
||||
header('Content-type: application/pdf');
|
||||
header('Content-Disposition: inline; filename='.basename($filename));
|
||||
header('Content-Transfer-Encoding: binary');
|
||||
header('Content-Length: '.filesize($filename));
|
||||
|
||||
readfile($filename);
|
||||
unlink($filename);
|
||||
} else {
|
||||
die(die(Tools::displayError('The invoice was not found.'));)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -507,13 +507,13 @@ class PSCleaner extends Module
|
||||
|
||||
case 'sales':
|
||||
$tables = array(
|
||||
'customer',
|
||||
// 'customer',
|
||||
'cart',
|
||||
'cart_product',
|
||||
'connections',
|
||||
'connections_page',
|
||||
'connections_source',
|
||||
'customer_group',
|
||||
// 'customer_group',
|
||||
'customer_message',
|
||||
'customer_message_sync_imap',
|
||||
'customer_thread',
|
||||
@ -555,7 +555,7 @@ class PSCleaner extends Module
|
||||
|
||||
foreach ($tables as $table)
|
||||
$db->execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`');
|
||||
$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0');
|
||||
// $db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0');
|
||||
$db->execute('UPDATE `'._DB_PREFIX_.'employee` SET `id_last_order` = 0,`id_last_customer_message` = 0,`id_last_customer` = 0');
|
||||
|
||||
break;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -31,11 +31,40 @@ class CategoryController extends CategoryControllerCore
|
||||
protected function assignSubcategories()
|
||||
{
|
||||
|
||||
$families = Category::getCategoriesTree(Category::CATEGORY_HOME, 0, 1);
|
||||
$categoriesTree = Category::getCategoriesTree($this->category->id_parent, 0, 1);
|
||||
$families = Category::getCategoriesTree(Category::CATEGORY_HOME, 0, 3);
|
||||
|
||||
// Si on est sur une catégorie enfant direct des familles
|
||||
if(in_array($this->category->id_parent, array(Category::CATEGORY_COLLECTION, Category::CATEGORY_SAVEUR))) {
|
||||
$categoriesTree = Category::getCategoriesTree($this->category->id_parent, 0, 2);
|
||||
$children = Category::getCategoriesTree($this->category->id_category, 0, 1);
|
||||
|
||||
foreach($families as $key => $category)
|
||||
{
|
||||
$families[$key]['active'] = $category['id_category'] == $this->category->id_parent;
|
||||
}
|
||||
}
|
||||
|
||||
// Sinon si on est sur un sous-enfant (tabacs, menthe, autres...). On remonte d'un niveau avant de générer l'arbo
|
||||
else
|
||||
{
|
||||
$categoryParent = new Category($this->category->id_parent);
|
||||
$categoriesTree = Category::getCategoriesTree($categoryParent->id_parent, 0, 2);
|
||||
$children = Category::getCategoriesTree($categoryParent->id_category, 0, 1);
|
||||
|
||||
foreach($families as $key => $category)
|
||||
{
|
||||
$families[$key]['active'] = $category['id_category'] == $categoryParent->id_parent;
|
||||
}
|
||||
}
|
||||
|
||||
foreach($categoriesTree as $key => $category)
|
||||
{
|
||||
$categoriesTree[$key]['active'] = $category['id_category'] == $this->category->id_parent;
|
||||
}
|
||||
|
||||
$this->context->smarty->assign(array(
|
||||
'families' => $families,
|
||||
'children' => $children,
|
||||
'categoriesTree' => $categoriesTree
|
||||
));
|
||||
}
|
||||
|
||||
@ -46,8 +46,45 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div id="countdown">
|
||||
<span class="title">{l s='Ouverture le 18 Juillet !'}</span>
|
||||
<p class="timer"></p>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$("#countdown .timer").countdown("2016/07/18", function(event) {
|
||||
$(this).text(
|
||||
event.strftime('%D jours %Hh %Mm %Ss')
|
||||
);
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
#countdown {
|
||||
text-align: center;
|
||||
}
|
||||
#countdown .title {
|
||||
color: #fff;
|
||||
display: block;
|
||||
font-family: "DancingScript";
|
||||
font-size: 32px;
|
||||
margin-bottom: 10px;
|
||||
padding: 0;
|
||||
text-align: center;
|
||||
text-transform: none
|
||||
}
|
||||
#countdown .timer {
|
||||
color: #fff;
|
||||
display: block;
|
||||
font-family: "ITCAvantGarde";
|
||||
font-size: 16px;
|
||||
padding: 0;
|
||||
text-transform: none
|
||||
}
|
||||
</style>
|
||||
-->
|
||||
</section>
|
||||
</main>
|
||||
</main>
|
||||
|
||||
|
||||
{strip}
|
||||
|
||||
@ -10,23 +10,35 @@
|
||||
<nav>
|
||||
<ul id="family">
|
||||
{foreach from=$families item=family}
|
||||
<li{if $family.id_category == $category->id_parent} class="active"{/if}>
|
||||
<li{if $family.active} class="active"{/if}>
|
||||
<a title="{$family.name}" href="{$family.link}">{$family.name}</a>
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
<ul id="children-categories">
|
||||
{foreach from=$categoriesTree item=child}
|
||||
<li{if $child.id_category == $category->id} class="active"{/if}>
|
||||
{if $child.id_category != 2}
|
||||
<li{if $child.id_category == $category->id || $child.active} class="active"{/if}>
|
||||
<a href="{$child.link}">{$child.name}</a>
|
||||
</li>
|
||||
{/if}
|
||||
{/foreach}
|
||||
<li class="search">
|
||||
{hook h="displaySearch"}
|
||||
</li>
|
||||
</ul>
|
||||
{if $children}
|
||||
<ul id="subchildren-categories">
|
||||
{foreach from=$children item=child}
|
||||
<li{if $child.id_category == $category->id} class="active"{/if}>
|
||||
<a href="{$child.link}">{$child.name}</a>
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
{/if}
|
||||
</nav>
|
||||
|
||||
|
||||
<div class="messages">
|
||||
{hook h="displayAlert"}
|
||||
</div>
|
||||
|
||||
@ -190,6 +190,52 @@ body#index main, body#password main { background: #000 }
|
||||
top: 0;
|
||||
width: 25px;
|
||||
}
|
||||
#search main nav #subchildren-categories,
|
||||
#category main nav #subchildren-categories {
|
||||
background: #202020;
|
||||
padding: 0 15px 22px 15px;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
z-index: 3;
|
||||
}
|
||||
#search main nav #subchildren-categories:before,
|
||||
#category main nav #subchildren-categories:before {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
content: "";
|
||||
display: block;
|
||||
left: 50%;
|
||||
height: 1px;
|
||||
margin: 0 0 0 -225px;
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
width: 450px;
|
||||
}
|
||||
#search main nav #subchildren-categories li,
|
||||
#category main nav #subchildren-categories li {
|
||||
display: inline-block;
|
||||
}
|
||||
#search main nav #subchildren-categories li a,
|
||||
#category main nav #subchildren-categories li a {
|
||||
background: #3c3c3c;
|
||||
border-radius: 2px;
|
||||
color: #fff;
|
||||
display: block;
|
||||
font-family: 'ITCAvantGarde';
|
||||
font-size: 13px;
|
||||
margin: 0 5px;
|
||||
padding: 8px 16px;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
#search main nav #subchildren-categories li.active a, #search main nav #subchildren-categories li a:hover,
|
||||
#category main nav #subchildren-categories li.active a, #category main nav #subchildren-categories li a:hover {
|
||||
background: #bfa56d;
|
||||
background: -webkit-linear-gradient(top, #bfa56d, #f9e48f);
|
||||
background: -o-linear-gradient(top, #bfa56d, #f9e48f);
|
||||
background: -moz-linear-gradient(top, #bfa56d, #f9e48f);
|
||||
background: linear-gradient(to top, #bfa56d, #f9e48f);
|
||||
color: #202020;
|
||||
}
|
||||
|
||||
#category .messages {
|
||||
background: #bfa56d;
|
||||
@ -845,10 +891,14 @@ body#index main, body#password main { background: #000 }
|
||||
body .addresses {
|
||||
padding: 50px 15px;
|
||||
}
|
||||
.addresses .addressesAreEquals {
|
||||
.addresses .addressesAreEquals {
|
||||
padding: 0 0 10px 0;
|
||||
margin: 0
|
||||
}
|
||||
.addresses #address_invoice { padding-top: 15px; }
|
||||
.csspointerevents .addresses #address_invoice_form { pointer-events: none }
|
||||
.csspointerevents .addresses #address_invoice_form.open { pointer-events: auto }
|
||||
.addresses .addressesAreEquals label { font-size: 13px; max-width: 80% }
|
||||
.addresses #address_delivery_form {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
@ -856,7 +856,6 @@ body .fancybox-overlay {
|
||||
|
||||
/* CustomCheckbox */
|
||||
.custom-checkbox {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
.custom-checkbox input {
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
<link rel="stylesheet" href="{$css_uri|escape:'html':'UTF-8'}" type="text/css" media="{$media}" />
|
||||
{/foreach}
|
||||
{/if}
|
||||
|
||||
|
||||
{if isset($js_defer) && !$js_defer && isset($js_files) && isset($js_def)}
|
||||
{$js_def}
|
||||
@ -34,6 +35,9 @@
|
||||
<script type="text/javascript" src="{$js_uri|escape:'html':'UTF-8'}"></script>
|
||||
{/foreach}
|
||||
{/if}
|
||||
{if $page_name == 'index'}
|
||||
<script type="text/javascript" src="{$js_dir}tools/countdown.js"></script>
|
||||
{/if}
|
||||
{$HOOK_HEADER}
|
||||
<link rel="stylesheet" href="http{if Tools::usingSecureMode()}s{/if}://fonts.googleapis.com/css?family=Open+Sans:300,600&subset=latin,latin-ext" type="text/css" media="all" />
|
||||
<!--[if IE 8]>
|
||||
|
||||
@ -8,4 +8,4 @@
|
||||
{hook h="displaySubCategories"}
|
||||
</main>
|
||||
|
||||
{hook h="displayManufacturers"}
|
||||
{hook h="displayManufacturers"}
|
||||
|
||||
@ -124,7 +124,12 @@ $(document).ready(function() {
|
||||
$('html, body').animate({ scrollTop: 0 }, 600);
|
||||
});
|
||||
|
||||
setTimeout(messagesFade, 5000);
|
||||
if($('.message').length > 1) {
|
||||
setTimeout(messagesFade, 5000);
|
||||
}
|
||||
else {
|
||||
$('.message').addClass('open')
|
||||
}
|
||||
|
||||
$('.empty-cart').on('click', function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
@ -61,13 +61,13 @@ function updateAddressesDisplay(first_view)
|
||||
if ($('#addressesAreEquals:checked').length === 1 && ($('#multishipping_mode_checkbox:checked').length === 0))
|
||||
{
|
||||
if ($('#multishipping_mode_checkbox:checked').length === 0) {
|
||||
first_view ? $('#address_invoice_form').css('opacity', 0) : $('#address_invoice_form').css('opacity', 0).removeClass('open');
|
||||
first_view ? $('#address_invoice_form').hide() : $('#address_invoice_form').slideUp().removeClass('open');
|
||||
}
|
||||
$('ul#address_invoice').html($('ul#address_delivery').html());
|
||||
}
|
||||
else
|
||||
{
|
||||
first_view ? $('#address_invoice_form').css('opacity', 1) : $('#address_invoice_form').attr('style', '').addClass('open');
|
||||
first_view ? $('#address_invoice_form').show() : $('#address_invoice_form').slideDown().addClass('open');
|
||||
if ($('#id_address_invoice').val())
|
||||
updateAddressDisplay('invoice');
|
||||
else
|
||||
|
||||
22
themes/roykin/js/tools/countdown.js
Normal file
22
themes/roykin/js/tools/countdown.js
Normal file
@ -0,0 +1,22 @@
|
||||
/*!
|
||||
* The Final Countdown for jQuery v2.1.0 (http://hilios.github.io/jQuery.countdown/)
|
||||
* Copyright (c) 2015 Edson Hilios
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery)}(function(a){"use strict";function b(a){if(a instanceof Date)return a;if(String(a).match(g))return String(a).match(/^[0-9]*$/)&&(a=Number(a)),String(a).match(/\-/)&&(a=String(a).replace(/\-/g,"/")),new Date(a);throw new Error("Couldn't cast `"+a+"` to a date object.")}function c(a){var b=a.toString().replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1");return new RegExp(b)}function d(a){return function(b){var d=b.match(/%(-|!)?[A-Z]{1}(:[^;]+;)?/gi);if(d)for(var f=0,g=d.length;g>f;++f){var h=d[f].match(/%(-|!)?([a-zA-Z]{1})(:[^;]+;)?/),j=c(h[0]),k=h[1]||"",l=h[3]||"",m=null;h=h[2],i.hasOwnProperty(h)&&(m=i[h],m=Number(a[m])),null!==m&&("!"===k&&(m=e(l,m)),""===k&&10>m&&(m="0"+m.toString()),b=b.replace(j,m.toString()))}return b=b.replace(/%%/,"%")}}function e(a,b){var c="s",d="";return a&&(a=a.replace(/(:|;|\s)/gi,"").split(/\,/),1===a.length?c=a[0]:(d=a[0],c=a[1])),1===Math.abs(b)?d:c}var f=[],g=[],h={precision:100,elapse:!1};g.push(/^[0-9]*$/.source),g.push(/([0-9]{1,2}\/){2}[0-9]{4}( [0-9]{1,2}(:[0-9]{2}){2})?/.source),g.push(/[0-9]{4}([\/\-][0-9]{1,2}){2}( [0-9]{1,2}(:[0-9]{2}){2})?/.source),g=new RegExp(g.join("|"));var i={Y:"years",m:"months",n:"daysToMonth",w:"weeks",d:"daysToWeek",D:"totalDays",H:"hours",M:"minutes",S:"seconds"},j=function(b,c,d){this.el=b,this.$el=a(b),this.interval=null,this.offset={},this.options=a.extend({},h),this.instanceNumber=f.length,f.push(this),this.$el.data("countdown-instance",this.instanceNumber),d&&("function"==typeof d?(this.$el.on("update.countdown",d),this.$el.on("stoped.countdown",d),this.$el.on("finish.countdown",d)):this.options=a.extend({},h,d)),this.setFinalDate(c),this.start()};a.extend(j.prototype,{start:function(){null!==this.interval&&clearInterval(this.interval);var a=this;this.update(),this.interval=setInterval(function(){a.update.call(a)},this.options.precision)},stop:function(){clearInterval(this.interval),this.interval=null,this.dispatchEvent("stoped")},toggle:function(){this.interval?this.stop():this.start()},pause:function(){this.stop()},resume:function(){this.start()},remove:function(){this.stop.call(this),f[this.instanceNumber]=null,delete this.$el.data().countdownInstance},setFinalDate:function(a){this.finalDate=b(a)},update:function(){if(0===this.$el.closest("html").length)return void this.remove();var b,c=void 0!==a._data(this.el,"events"),d=new Date;b=this.finalDate.getTime()-d.getTime(),b=Math.ceil(b/1e3),b=!this.options.elapse&&0>b?0:Math.abs(b),this.totalSecsLeft!==b&&c&&(this.totalSecsLeft=b,this.elapsed=d>=this.finalDate,this.offset={seconds:this.totalSecsLeft%60,minutes:Math.floor(this.totalSecsLeft/60)%60,hours:Math.floor(this.totalSecsLeft/60/60)%24,days:Math.floor(this.totalSecsLeft/60/60/24)%7,daysToWeek:Math.floor(this.totalSecsLeft/60/60/24)%7,daysToMonth:Math.floor(this.totalSecsLeft/60/60/24%30.4368),totalDays:Math.floor(this.totalSecsLeft/60/60/24),weeks:Math.floor(this.totalSecsLeft/60/60/24/7),months:Math.floor(this.totalSecsLeft/60/60/24/30.4368),years:Math.abs(this.finalDate.getFullYear()-d.getFullYear())},this.options.elapse||0!==this.totalSecsLeft?this.dispatchEvent("update"):(this.stop(),this.dispatchEvent("finish")))},dispatchEvent:function(b){var c=a.Event(b+".countdown");c.finalDate=this.finalDate,c.elapsed=this.elapsed,c.offset=a.extend({},this.offset),c.strftime=d(this.offset),this.$el.trigger(c)}}),a.fn.countdown=function(){var b=Array.prototype.slice.call(arguments,0);return this.each(function(){var c=a(this).data("countdown-instance");if(void 0!==c){var d=f[c],e=b[0];j.prototype.hasOwnProperty(e)?d[e].apply(d,b.slice(1)):null===String(e).match(/^[$A-Z_][0-9A-Z_$]*$/i)?(d.setFinalDate.call(d,e),d.start()):a.error("Method %s does not exist on jQuery.countdown".replace(/\%s/gi,e))}else new j(this,b[0],b[1])})}});
|
||||
@ -44,6 +44,28 @@
|
||||
<div class="inner">
|
||||
<h2 class="title">{l s ='Votre adresse de facturation'}</h2>
|
||||
<div class="box-content">
|
||||
<p class="addressesAreEquals clearfix"{if $cart->isVirtualCart()} style="display:none;"{/if}>
|
||||
<input type="checkbox" name="same" id="addressesAreEquals" class="custom-input inline" value="1"{if $cart->id_address_invoice == $cart->id_address_delivery || $addresses|@count == 1} checked="checked"{/if} />
|
||||
<label for="addressesAreEquals">{l s='Use the delivery address as the billing address.'}</label>
|
||||
</p>
|
||||
|
||||
<div id="address_invoice_form">
|
||||
{if $addresses|@count > 1}
|
||||
<select name="id_address_invoice" id="id_address_invoice" class="custom-input address_select form-control">
|
||||
{section loop=$addresses step=-1 name=address}
|
||||
<option value="{$addresses[address].id_address|intval}"{if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice} selected="selected"{/if}>
|
||||
{$addresses[address].alias|escape:'html':'UTF-8'}
|
||||
</option>
|
||||
{/section}
|
||||
</select>
|
||||
{else}
|
||||
{l s='Vous n\'avez qu\'une adresse disponible dans votre compte.'}
|
||||
<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1&select_address=1{if $back}&mod={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Add'}" class="add-address">
|
||||
{l s='Ajouter une adresse'}
|
||||
</a>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<!-- Détails -->
|
||||
<ul class="address alternate_item{if $cart->isVirtualCart()} full_width{/if}" id="address_invoice">
|
||||
</ul>
|
||||
@ -115,5 +137,6 @@
|
||||
{addJsDef addressUrlAdd=$smarty.capture.addressUrlAdd}
|
||||
{addJsDef formatedAddressFieldsValuesList=$formatedAddressFieldsValuesList}
|
||||
{addJsDef opc=$opc|boolval}
|
||||
|
||||
{addJsDefL name=liUpdate}{/addJsDefL}
|
||||
{/strip}
|
||||
Loading…
Reference in New Issue
Block a user