Laclic
/
Souke
Tarkkaile 5
Äänestä 0
Fork 1
Koodi Ongelmat 1 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

Intégration Souke

feature/souke
Guillaume Bourgeois 7 kuukautta sitten
vanhempi
146ee4c72a
commit
b93079c2dd
18 muutettua tiedostoa jossa 459 lisäystä ja 474 poistoa
Jaettu näkymä Näytä diff tilastot
  1. +78
    -66
      common/web/css/screen.css
  2. +47
    -24
      common/web/sass/_common.scss
  3. +3
    -3
      domain/Order/Order/OrderRepository.php
  4. +1
    -1
      domain/Payment/PaymentSolver.php
  5. +1
    -1
      producer/controllers/OrderController.php
  6. +2
    -1
      producer/views/credit/history.php
  7. +12
    -4
      producer/views/layouts/main.php
  8. +72
    -68
      producer/views/order/confirm.php
  9. +10
    -9
      producer/views/order/history.php
  10. +23
    -29
      producer/views/order/order.php
  11. +144
    -162
      producer/web/css/screen.css
  12. +5
    -7
      producer/web/sass/_layout.scss
  13. +1
    -1
      producer/web/sass/_responsive.scss
  14. +13
    -0
      producer/web/sass/credit/_history.scss
  15. +15
    -62
      producer/web/sass/order/_confirm.scss
  16. +27
    -35
      producer/web/sass/order/_order.scss
  17. +4
    -0
      producer/web/sass/site/_index.scss
  18. +1
    -1
      producer/web/sass/subscription/_form.scss

+ 78
- 66
common/web/css/screen.css Näytä tiedosto

@@ -143,7 +143,7 @@ termes.
#main {
/* Boutons */
/* Alertes */
/* Tableaux */
/* Tables */
/* Formulaires */
}
/* line 5, ../sass/_common.scss */
@@ -213,56 +213,68 @@ termes.
#main .alert.alert-dark {
background-color: #ece4d8 !important;
}
/* line 70, ../sass/_common.scss */
#main .table {
border: 0px none;
/* line 67, ../sass/_common.scss */
#main .alert a {
color: black;
}
/* line 71, ../sass/_common.scss */
#main .alert p:last-child {
margin-bottom: 0px;
}
/* line 73, ../sass/_common.scss */
#main .table.table-striped > tbody > tr:nth-of-type(2n) > *,
/* line 82, ../sass/_common.scss */
#main .table thead tr th {
font-family: 'worksans_semibold';
}
/* line 92, ../sass/_common.scss */
#main .table.table-striped {
border: 0px none;
}
/* line 95, ../sass/_common.scss */
#main .table.table-striped.table-striped > tbody > tr:nth-of-type(2n) > *,
#main .table.table-striped thead tr th {
background-color: #ece4d8;
}
/* line 78, ../sass/_common.scss */
#main .table.table-striped > tbody > tr:nth-of-type(2n+1) > * {
/* line 100, ../sass/_common.scss */
#main .table.table-striped.table-striped > tbody > tr:nth-of-type(2n+1) > * {
background-color: #f8f7f3;
}
/* line 82, ../sass/_common.scss */
#main .table thead tr th,
#main .table tbody tr td {
/* line 104, ../sass/_common.scss */
#main .table.table-striped thead tr th,
#main .table.table-striped tbody tr td {
-moz-box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
-webkit-box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
box-shadow: -20px 0 20px -20px rgba(0, 0, 0, 0.2) inset;
}
/* line 86, ../sass/_common.scss */
#main .table thead tr th:last-child,
#main .table tbody tr td:last-child {
/* line 108, ../sass/_common.scss */
#main .table.table-striped thead tr th:last-child,
#main .table.table-striped tbody tr td:last-child {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
/* line 92, ../sass/_common.scss */
#main .table thead tr {
/* line 114, ../sass/_common.scss */
#main .table.table-striped thead tr {
border: 0px none;
}
/* line 94, ../sass/_common.scss */
#main .table thead tr th {
/* line 116, ../sass/_common.scss */
#main .table.table-striped thead tr th {
border: 0px none;
padding: 10px 20px;
}
/* line 102, ../sass/_common.scss */
#main .table tbody tr {
/* line 124, ../sass/_common.scss */
#main .table.table-striped tbody tr {
border: 0px none;
}
/* line 104, ../sass/_common.scss */
#main .table tbody tr td {
/* line 126, ../sass/_common.scss */
#main .table.table-striped tbody tr td {
border: 0px none;
padding: 20px;
}
/* line 114, ../sass/_common.scss */
/* line 137, ../sass/_common.scss */
#main form .control-label {
font-family: 'worksans_medium';
}
/* line 118, ../sass/_common.scss */
/* line 141, ../sass/_common.scss */
#main form input[type="text"],
#main form input[type="email"],
#main form input[type="password"],
@@ -276,60 +288,60 @@ termes.
border-radius: 0px;
border: solid 1px #b7ab9b;
}
/* line 128, ../sass/_common.scss */
/* line 151, ../sass/_common.scss */
#main form .form-control:hover {
border: solid 1px gray;
}
/* line 132, ../sass/_common.scss */
/* line 155, ../sass/_common.scss */
#main form .form-control:focus {
-moz-box-shadow: 0px 0px 0px 1px #ee6f42;
-webkit-box-shadow: 0px 0px 0px 1px #ee6f42;
box-shadow: 0px 0px 0px 1px #ee6f42;
border: solid 1px #ee6f42;
}
/* line 138, ../sass/_common.scss */
/* line 161, ../sass/_common.scss */
#main form .has-error .control-label {
color: black;
}
/* line 142, ../sass/_common.scss */
/* line 165, ../sass/_common.scss */
#main form .has-error .form-control:focus, #main form .has-error .form-control {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
border-color: #a94442;
}
/* line 147, ../sass/_common.scss */
/* line 170, ../sass/_common.scss */
#main form .has-error .help-block-error {
color: #a94442;
}
/* line 152, ../sass/_common.scss */
/* line 175, ../sass/_common.scss */
#main form .form-buttons {
text-align: right;
}

/* Divers */
/* line 159, ../sass/_common.scss */
/* line 182, ../sass/_common.scss */
.float-left {
float: left;
}

/* line 163, ../sass/_common.scss */
/* line 186, ../sass/_common.scss */
.float-right {
float: right;
}

/* line 167, ../sass/_common.scss */
/* line 190, ../sass/_common.scss */
.clr {
clear: both;
}

/* Navigation utilisateur en haut du site */
/* line 172, ../sass/_common.scss */
/* line 195, ../sass/_common.scss */
.container-nav-user-top {
position: relative;
z-index: 999;
}
/* line 176, ../sass/_common.scss */
/* line 199, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: absolute;
top: 0px;
@@ -337,7 +349,7 @@ termes.
background-color: white;
z-index: 100;
}
/* line 183, ../sass/_common.scss */
/* line 206, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar {
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
@@ -347,16 +359,16 @@ termes.
margin: 0px;
min-height: 0px;
}
/* line 190, ../sass/_common.scss */
/* line 213, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
position: relative;
left: -10px;
}
/* line 194, ../sass/_common.scss */
/* line 217, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
padding-left: 5px;
}
/* line 197, ../sass/_common.scss */
/* line 220, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link {
padding-left: 10px;
padding-right: 10px;
@@ -366,12 +378,12 @@ termes.
color: black;
font-size: 16px;
}
/* line 206, ../sass/_common.scss */
/* line 229, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link:hover, .container-nav-user-top .nav-user-top .navbar ul li a.nav-link:focus, .container-nav-user-top .nav-user-top .navbar ul li a.nav-link.active {
background: none;
color: #ee6f42;
}
/* line 211, ../sass/_common.scss */
/* line 234, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link .bi {
color: #ee6f42;
font-size: 16px;
@@ -379,55 +391,55 @@ termes.
position: relative;
top: 1px;
}
/* line 221, ../sass/_common.scss */
/* line 244, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a {
padding: 2px 20px;
}
/* line 224, ../sass/_common.scss */
/* line 247, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a:hover, .container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a:focus {
background-color: #ece4d8;
}
/* line 233, ../sass/_common.scss */
/* line 256, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu {
z-index: 9999;
}
/* line 235, ../sass/_common.scss */
/* line 258, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu .divider.dropdown-header {
padding: 0px;
}

@media screen and (max-width: 991px) {
/* line 245, ../sass/_common.scss */
/* line 268, ../sass/_common.scss */
.container-nav-user-top {
padding: 0px;
margin: 0px;
width: 100%;
max-width: none;
}
/* line 251, ../sass/_common.scss */
/* line 274, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: relative;
}
/* line 255, ../sass/_common.scss */
/* line 278, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
width: 100%;
display: block;
margin-right: 0px;
text-align: center;
}
/* line 261, ../sass/_common.scss */
/* line 284, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
display: inline-block;
}
/* line 265, ../sass/_common.scss */
/* line 288, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li.nav-item-producers .dropdown-menu {
right: -95px;
}
/* line 272, ../sass/_common.scss */
/* line 295, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .link-text {
display: none;
}
/* line 276, ../sass/_common.scss */
/* line 299, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu {
position: absolute;
right: 5%;
@@ -438,32 +450,32 @@ termes.
-webkit-box-shadow: 0px 0px 4px gray;
box-shadow: 0px 0px 4px gray;
}
/* line 285, ../sass/_common.scss */
/* line 308, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu li a {
padding-left: 15px;
}
}
/* Block de date */
/* line 296, ../sass/_common.scss */
/* line 319, ../sass/_common.scss */
.block-date {
margin: 0px auto;
padding-top: 0px;
text-align: center;
}
/* line 301, ../sass/_common.scss */
/* line 324, ../sass/_common.scss */
.block-date .day {
text-transform: capitalize;
line-height: 15px;
font-size: 13px;
text-transform: uppercase;
}
/* line 308, ../sass/_common.scss */
/* line 331, ../sass/_common.scss */
.block-date .num {
font-size: 30px;
line-height: 35px;
font-weight: bold;
}
/* line 314, ../sass/_common.scss */
/* line 337, ../sass/_common.scss */
.block-date .month {
text-transform: uppercase;
line-height: 15px;
@@ -472,46 +484,46 @@ termes.
}

/* Page d'erreur */
/* line 324, ../sass/_common.scss */
/* line 347, ../sass/_common.scss */
#main #content .site-error .col-lg-6 {
margin: 0px auto;
float: none;
}
/* line 330, ../sass/_common.scss */
/* line 353, ../sass/_common.scss */
#main #content .site-error .panel .panel-body {
padding-bottom: 0px;
}
/* line 334, ../sass/_common.scss */
/* line 357, ../sass/_common.scss */
#main #content .site-error .panel h2 {
text-transform: none;
font-size: 25px;
margin-top: 0px;
margin-bottom: 0px;
}
/* line 342, ../sass/_common.scss */
/* line 365, ../sass/_common.scss */
#main #content .site-error .alert {
padding-bottom: 5px;
}
/* line 345, ../sass/_common.scss */
/* line 368, ../sass/_common.scss */
#main #content .site-error .alert h2 {
margin-top: 5px;
}
/* line 349, ../sass/_common.scss */
/* line 372, ../sass/_common.scss */
#main #content .site-error .alert p {
margin-bottom: 15px;
}
/* line 353, ../sass/_common.scss */
/* line 376, ../sass/_common.scss */
#main #content .site-error .alert .btn {
text-decoration: none;
}

/* Paiement */
/* line 364, ../sass/_common.scss */
/* line 387, ../sass/_common.scss */
.payment-detail-remaining-surplus {
font-size: 13px;
color: gray;
}
/* line 368, ../sass/_common.scss */
/* line 391, ../sass/_common.scss */
.payment-detail-remaining-surplus strong {
font-weight: bold;
}

+ 47
- 24
common/web/sass/_common.scss Näytä tiedosto

@@ -63,47 +63,70 @@
&.alert-dark {
background-color: $color-gray !important;
}

a {
color: black;
}

p:last-child {
margin-bottom: 0px;
}
}

/* Tableaux */
/* Tables */
$table-striped-bg-factor: black;
.table {
border: 0px none;

&.table-striped > tbody > tr:nth-of-type(2n) > *,
thead tr th {
background-color: $color-gray;
thead {
tr {
th {
font-family: 'worksans_semibold';
}
}
}

&.table-striped > tbody > tr:nth-of-type(2n+1) > * {
background-color: #f8f7f3;
&.table-bordered {
}

thead tr th,
tbody tr td {
@include box-shadow(-20px 0 20px -20px rgba(0,0,0,0.2) inset);
&.table-striped {
border: 0px none;

&.table-striped > tbody > tr:nth-of-type(2n) > *,
thead tr th {
background-color: $color-gray;
}

&:last-child {
@include box-shadow(none);
&.table-striped > tbody > tr:nth-of-type(2n+1) > * {
background-color: #f8f7f3;
}
}

thead {
tr {
border: 0px none;
th {
thead tr th,
tbody tr td {
@include box-shadow(-20px 0 20px -20px rgba(0,0,0,0.2) inset);

&:last-child {
@include box-shadow(none);
}
}

thead {
tr {
border: 0px none;
padding: 10px 20px;
th {
border: 0px none;
padding: 10px 20px;
}
}
}
}

tbody {
tr {
border: 0px none;
td {
tbody {
tr {
border: 0px none;
padding: 20px;
td {
border: 0px none;
padding: 20px;
}
}
}
}

+ 3
- 3
domain/Order/Order/OrderRepository.php Näytä tiedosto

@@ -572,10 +572,10 @@ class OrderRepository extends AbstractRepository
}
elseif($this->isCreditAutoPayment($order) && $amountTotal != 0) {
if($order->subscription && $order->subscription->auto_payment == 0) {
$label = 'Crédit désactivé';
$label = 'Cagnotte désactivée';
}
else {
$label = 'Crédit non débité';
$label = 'Cagnotte non débitée';
}
}
elseif($amountTotal == 0) {
@@ -589,7 +589,7 @@ class OrderRepository extends AbstractRepository
$mainPayment = $this->getMainPayment($order);
if($mainPayment) {
if($this->paymentSolver->isMeanPaymentCredit($mainPayment)) {
$label = 'Crédit débité';
$label = 'Cagnotte débitée';
}
else {
$label = MeanPayment::getStrBy($mainPayment->mean_payment);

+ 1
- 1
domain/Payment/PaymentSolver.php Näytä tiedosto

@@ -41,7 +41,7 @@ class PaymentSolver extends AbstractService implements SolverInterface
public function getAmount(Payment $payment, bool $format = false): string
{
if ($format) {
return number_format($payment->getAmount(), 2) . ' €';
return number_format($payment->getAmount(), 2, ',', ' ') . ' €';
} else {
return $payment->getAmount();
}

+ 1
- 1
producer/controllers/OrderController.php Näytä tiedosto

@@ -645,7 +645,7 @@ class OrderController extends ProducerBaseController
public function ajaxInfosProducer(Producer $producer)
{
return [
'order_infos' => $producer->order_infos,
'order_infos' => nl2br($producer->order_infos),
'credit' => $producer->credit,
'credit_functioning' => $producer->credit_functioning,
'use_credit_checked_default' => $producer->use_credit_checked_default,

+ 2
- 1
producer/views/credit/history.php Näytä tiedosto

@@ -44,7 +44,7 @@ use yii\grid\GridView;
$paymentManager = PaymentModule::getInstance();
$featureChecker = FeatureModule::getInstance()->getChecker();
$producer = $this->context->getProducerCurrent();
$this->setTitle('Cagnotte : <span id="credit-user">' . number_format($creditUser, 2) . ' €</span>');
$this->setTitle('Cagnotte <div id="credit-user">' . number_format($creditUser, 2, ',', ' ') . ' €</div>');
$this->setPageTitle('Crédit');

if ($featureChecker->isEnabled(Feature::ALIAS_ONLINE_PAYMENT) && $this->context->getProducerCurrent()->online_payment) {
@@ -60,6 +60,7 @@ if ($featureChecker->isEnabled(Feature::ALIAS_ONLINE_PAYMENT) && $this->context-
?>

<?= GridView::widget([
'summary' => '',
'dataProvider' => $dataProvider,
'columns' => [
[

+ 12
- 4
producer/views/layouts/main.php Näytä tiedosto

@@ -89,13 +89,15 @@ $mainColor = $producer->option_main_color ?: '#ee6f42' ;
#header #title h2 .location .bi,
#content a,
.credit-history #credit-user,
.credit-history #content .table span.payment-positive {
.credit-history #content .table span.payment-positive,
.order-order #main #app-order-order #steps ul li .info-step {
color: <?= $mainColor ?>
}
#header nav#main-nav ul li.active a,
#header nav#main-nav ul li a:hover,
#header nav#main-nav ul li a span.label-success,
#main .btn-primary {
#main .btn-primary,
.order-order #main #app-order-order #steps ul li .btn.btn-primary {
background-color: <?= $mainColor ?>;
}
#header nav#main-nav {
@@ -105,6 +107,12 @@ $mainColor = $producer->option_main_color ?: '#ee6f42' ;
box-shadow: 0px 0px 0px 1px <?= $mainColor ?>;
border: solid 1px <?= $mainColor ?>;
}
.order-order #main #app-order-order #steps ul li .btn.btn-primary::after {
border-left: 17px solid <?= $mainColor ?>;
}
#header nav#main-nav ul li a span.label.label-success {
border: solid 1px <?= $mainColor ?>;
}
</style>
</head>
<body class="<?= \Yii::$app->controller->id . '-' . \Yii::$app->controller->action->id ?>">
@@ -201,13 +209,13 @@ $mainColor = $producer->option_main_color ?: '#ee6f42' ;
'label' => '<i class="bi bi-pencil-square"></i> Commander',
'url' => $this->getUrlManagerProducer()->createUrl(['order/order']),
'visible' => $producer->option_allow_order_guest || !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
'active' => in_array($this->getControllerAction(), ['order/order', 'order/confirm']),
],
[
'label' => '<i class="bi bi-pencil-square"></i> Commander',
'url' => $this->getUrlManagerFrontend()->createAbsoluteUrl(['site/producer', 'id' => $this->context->getProducerCurrent()->id, 'return_url' => \Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order', 'slug_producer' => $this->context->getProducerCurrent()->slug])]),
'visible' => !$producer->option_allow_order_guest && \Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
'active' => in_array($this->getControllerAction(), ['order/order', 'order/confirm']),
],
[
'label' => '<i class="bi bi-folder2-open"></i> Mes commandes <span class="label label-' . $labelOrders . '">' . $countOrders . '</span>',

+ 72
- 68
producer/views/order/confirm.php Näytä tiedosto

@@ -61,91 +61,95 @@ $this->setTitle('Confirmation de commande') ;
</div>
<?php else: ?>
<div class="alert alert-success">
<span class="glyphicon glyphicon-ok glyphicon-big"></span>
<div class="content">
<h3>Votre commande a bien été prise en compte</h3>
<?php if(!Yii::$app->user->isGuest): ?>
<a href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history']) ?>" class="btn btn-default">
<span class="glyphicon glyphicon-chevron-right"></span>
Voir toutes mes commandes
<h4 class="alert-heading">
<i class="bi bi-check2-square"></i>
Votre commande a bien été prise en compte
</h4>
<?php if(!Yii::$app->user->isGuest): ?>
<p>
<a href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history']) ?>">
Voir mes commandes
</a>
<?php endif; ?>
</div>
<div class="clr"></div>
</p>
<?php endif; ?>
</div>
<?php endif; ?>

<div class="alert alert-info alert-order-summary">
<span class="glyphicon glyphicon-list-alt glyphicon-big"></span>
<div class="content">
<h3>Récapitulatif de votre commande</h3>

<div class="row">
<div class="col-md-6">
<ul>
<?php if($order->reference && strlen($order->reference) > 0): ?><li><span class="glyphicon glyphicon-check"></span> Commande N°<strong><?= Html::encode($order->reference); ?></strong></li><?php endif; ?>
<li><span class="glyphicon glyphicon-time"></span>Le <?= date('d/m/Y',strtotime($order->distribution->date)) ?></li>
<li><span class="glyphicon glyphicon-map-marker"></span>
<?php if($order->delivery_home): ?>
Livraison à domicile
<br /><span class="locality"><?= nl2br(Html::encode($order->delivery_address)); ?></span>
<?php else: ?>
<?= Html::encode($order->pointSale->name) ?><?php if(strlen($order->pointSale->name)): ?>
<?php if($order->pointSale->is_bread_box && $order->pointSale->bread_box_code): ?>
(Code : <strong><?= $order->pointSale->bread_box_code; ?></strong>)
<?php endif; ?>
<span class="locality">à <?= $pointSaleModule->getSolver()->getLocalityWithAddressTooltip($order->pointSale) ?></span>
<h4 class="alert-heading">
<i class="bi bi-list-check"></i>
Récapitulatif
</h4>
<div class="row">
<div class="col-md-6">
<ul>
<?php if($order->reference && strlen($order->reference) > 0): ?><li><span class="glyphicon glyphicon-check"></span> Commande N°<strong><?= Html::encode($order->reference); ?></strong></li><?php endif; ?>
<li><i class="bi bi-clock"></i> Le <?= date('d/m/Y',strtotime($order->distribution->date)) ?></li>
<li><i class="bi bi-geo-alt"></i>
<?php if($order->delivery_home): ?>
Livraison à domicile
<br /><span class="locality"><?= nl2br(Html::encode($order->delivery_address)); ?></span>
<?php else: ?>
<?= Html::encode($order->pointSale->name) ?><?php if(strlen($order->pointSale->name)): ?>
<?php if($order->pointSale->is_bread_box && $order->pointSale->bread_box_code): ?>
(Code : <strong><?= $order->pointSale->bread_box_code; ?></strong>)
<?php endif; ?>
<span class="locality">à <?= $pointSaleModule->getSolver()->getLocalityWithAddressTooltip($order->pointSale) ?></span>
<?php endif; ?>
</li>
<?php
$strInfos = '';
if($order->pointSale) {
$strInfos = $pointSaleModule->getStrInfos($order->pointSale, strtolower(date('l',strtotime($order->distribution->date))));
}
?>
<?php if(strlen($strInfos) > 0): ?>
<li><span class="glyphicon glyphicon-info-sign"></span>
<span class="infos"><?= $strInfos ?></span>
</li>
<?php endif; ?>
</ul>
</div>
<div class="col-md-6">
<ul>
<li>
<p><strong>Produit<?php if($orderModule->countProducts($order) > 1): ?>s<?php endif; ?></strong></p>
<p><?= $orderModule->getCartSummary($order) ?></p>
</li>
<li>Total : <strong><?= $orderModule->getOrderAmountWithTax($order,Order::AMOUNT_TOTAL, true); ?></strong></li>
</ul>

<?php endif; ?>
</li>
<?php
$strInfos = '';
if($order->pointSale) {
$strInfos = $pointSaleModule->getStrInfos($order->pointSale, strtolower(date('l',strtotime($order->distribution->date))));
}
?>
<?php if(strlen($strInfos) > 0): ?>
<li>
<i class="bi bi-info-circle"></i>
<span class="infos"><?= $strInfos ?></span>
</li>
<?php endif; ?>
</ul>
</div>
<div class="col-md-6">
<p>
<i class="bi bi-list-ul"></i>
Produits
</p>
<div class="summary">
<?= $orderModule->getCartSummary($order) ?>
</div>
<p>
<i class="bi bi-arrow-return-right"></i>
<strong><?= $orderModule->getOrderAmountWithTax($order,Order::AMOUNT_TOTAL, true); ?></strong>
</p>
</div>

</div>
<div class="clr"></div>
</div>

<?php if($producer->option_payment_info && strlen($producer->option_payment_info) > 0): ?>
<div class="panel panel-warning payment-info">
<div class="panel-heading">
<h3>Paiement de votre commande</h3>
</div>
<div class="panel-body">
<?= nl2br($producer->option_payment_info); ?>
</div>
<div class="card card-payment-infos">
<div class="card-body">
<h5 class="card-title">
<i class="bi bi-wallet2"></i>
Paiement de votre commande
</h5>
<?= nl2br($producer->option_payment_info); ?>
</div>
</div>
<?php endif; ?>

<?php if ($producer->order_infos && strlen($producer->order_infos) > 0): ?>
<div class="panel panel-info">
<div class="panel-heading">
<h3>Informations</h3>
</div>
<div class="panel-body">
<?= nl2br($producer->order_infos); ?>
</div>
<div class="card card-infos">
<div class="card-body">
<h5 class="card-title">
<i class="bi bi-info-circle"></i>
Informations
</h5>
<?= nl2br($producer->order_infos); ?>
</div>
</div>
<?php endif; ?>
</div>

+ 10
- 9
producer/views/order/history.php Näytä tiedosto

@@ -63,14 +63,14 @@ $this->addButton(['label' => '<span class="glyphicon glyphicon-plus"></span> Ajo
<?php endif; ?>

<ul id="tabs-orders-history" class="nav nav-tabs" role="tablist">
<li class="<?php if($type == 'incoming'): ?>active<?php endif; ?>">
<a href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history', 'type' => 'incoming']); ?>">
<li class="nav-item">
<a class="nav-link<?php if($type == 'incoming'): ?> active<?php endif; ?>" href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history', 'type' => 'incoming']); ?>">
À venir
<span class="label <?php if($countIncoming): ?>label-success<?php else: ?>label-default<?php endif; ?>"><?= $countIncoming ?></span>
</a>
</li>
<li class="<?php if($type == 'passed'): ?>active<?php endif; ?>">
<a href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history', 'type' => 'passed']); ?>">
<li class="nav-item">
<a class="nav-link<?php if($type == 'passed'): ?> active<?php endif; ?>" href="<?= \Yii::$app->urlManagerProducer->createUrl(['order/history', 'type' => 'passed']); ?>">
Passées
<span class="label label-default"><?= $countPassed ?></span>
</a>
@@ -132,7 +132,8 @@ GridView::widget([
$html .= '<span class="label label-warning">En préparation</span>' ;
}
elseif($orderModule->getState($order) == Order::STATE_OPEN) {
$html .= '<span class="label label-default">À venir</span>' ;
$html .= '<span class="label label-secondary">À venir</span>' ;
//$html .= '<span class="badge text-bg-secondary">À venir</span>' ;
}
}
@@ -148,13 +149,13 @@ GridView::widget([
if ($producerModule->isOnlinePaymentActiveAndTypeOrder($producer)) {
$paymentStatus = $orderModule->getPaymentStatus($order);
if($paymentStatus == Order::PAYMENT_UNPAID && $order->online_payment_url) {
$html .= '<a href="'.$order->online_payment_url.'" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span> Payer en ligne</a>';
$html .= '<a href="'.$order->online_payment_url.'" class="btn btn-default"><i class="bi bi-credit-card"></i> Payer en ligne</a>';
}
}
else {
$html .= '<a href="'.Yii::$app->urlManager->createUrl(['order/order','id'=>$order->id]).'" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a> '.
'<a href="'.Yii::$app->urlManager->createUrl(['order/cancel','id'=>$order->id]).'" class="btn btn-default"><span class="glyphicon glyphicon-trash"></span></a> '.
(($order->id_subscription) ? '<a href="'.Yii::$app->urlManagerProducer->createUrl(['subscription/form','id'=>$order->id_subscription]).'" class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span></a>' : '') ;
$html .= '<a href="'.Yii::$app->urlManager->createUrl(['order/order','id'=>$order->id]).'" class="btn btn-secondary"><i class="bi bi-pencil"></i></a> '.
'<a href="'.Yii::$app->urlManager->createUrl(['order/cancel','id'=>$order->id]).'" class="btn btn-secondary"><i class="bi bi-trash"></i></a> '.
(($order->id_subscription) ? '<a href="'.Yii::$app->urlManagerProducer->createUrl(['subscription/form','id'=>$order->id_subscription]).'" class="btn btn-secondary"><i class="bi bi-arrow-repeat"></i></a>' : '') ;
}
}


+ 23
- 29
producer/views/order/order.php Näytä tiedosto

@@ -79,7 +79,7 @@ $this->setTitle('Commander');
</div>
<div v-else>
<div id="steps">
<ul>
<ul class="row g-0">
<?php if ($producer->option_order_entry_point == Producer::ORDER_ENTRY_POINT_DATE): ?>
<step-date
first="true"
@@ -225,10 +225,10 @@ $this->setTitle('Commander');
<div id="content-step-point-sale" v-if="step == 'point-sale'">
<div v-if="!loading">
<h3>Où souhaitez-vous récupérer votre commande ?</h3>
<table id="points-sale" class="table table-bordered" v-if="pointsSale.length">
<table id="points-sale" class="table table-striped" v-if="pointsSale.length">
<thead>
<tr>
<th>Nom</th>
<th>Point de vente</th>
<th>Localité</th>
<th></th>
</tr>
@@ -386,21 +386,21 @@ $this->setTitle('Commander');
<template v-if="productHasPrice(product)">
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-default btn-moins"
<button class="btn btn-secondary btn-moins"
type="button"
@click="productQuantityClick(product, product.unit == 'piece' ? -1 : -parseFloat(product.step))"
:disabled="product.quantity_form == 0"><span
class="glyphicon glyphicon-minus"></span></button>
:disabled="product.quantity_form == 0">
<i class="bi bi-dash"></i></button>
</span>
<input type="text" v-model="product.quantity_form"
class="form-control quantity" readonly="readonly"/>
<span class="input-group-addon">{{ product.unit == 'piece' ? 'p.' : product.unit }}</span>
<span class="input-group-text">{{ product.unit == 'piece' ? 'p.' : product.unit }}</span>
<span class="input-group-btn">
<button class="btn btn-default btn-plus"
<button class="btn btn-secondary btn-plus"
type="button"
@click="productQuantityClick(product, product.unit == 'piece' ? 1 : parseFloat(product.step))"
:disabled="product.quantity_form == product.quantity_remaining && product.quantity_max > 0"><span
class="glyphicon glyphicon-plus"></span></button>
:disabled="product.quantity_form == product.quantity_remaining && product.quantity_max > 0">
<i class="bi bi-plus"></i></button>
</span>
</div>
</template>
@@ -567,14 +567,13 @@ $this->setTitle('Commander');
</div>
</div>

<div id="infos" v-if="producer != null && producer.order_infos != null && producer.order_infos.length">
<div class="panel panel-default">
<div class="panel-heading">
<i class="glyphicon glyphicon-info-sign"></i> Informations
</div>
<div class="panel-body">
{{ producer.order_infos }}
</div>
<div id="infos" class="card" v-if="producer != null && producer.order_infos != null && producer.order_infos.length">
<div class="card-body">
<h5 class="card-title">
<i class="bi bi-info-circle"></i>
Informations
</h5>
<div class="card-text" v-html="producer.order_infos"></div>
</div>
</div>

@@ -596,18 +595,13 @@ $this->setTitle('Commander');
<?php
$producer = GlobalParam::getCurrentProducer();
if ($producerModule->hasSpecificDelays($producer)): ?>
<div id="specific-delays" class="panel panel-default">
<div class="panel-heading">
Délais de commande spécifiques
</div>
<div class="panel-body">
<div id="specific-delays" class="card">
<div class="card-body">
<h5 class="card-title">
<i class="bi bi-clock"></i>
Délais de commande spécifiques
</h5>
<table class="table table-bordered">
<thead>
<tr>
<th>Jour</th>
<th>Délai</th>
</tr>
</thead>
<?php foreach ($producerModule->getSpecificDelays($producer) as $day => $delay): ?>
<?php if ($delay['order_delay'] && $delay['order_deadline']): ?>
<tr>

+ 144
- 162
producer/web/css/screen.css Näytä tiedosto

@@ -273,11 +273,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-transform: uppercase;
border: solid 1px transparent;
}
/* line 242, ../sass/_layout.scss */
#header nav#main-nav ul li a span.label.label-success {
border: solid 1px white;
}
/* line 248, ../sass/_layout.scss */
/* line 243, ../sass/_layout.scss */
#header nav#main-nav ul li.active a,
#header nav#main-nav ul li a:hover {
color: white;
@@ -285,11 +281,16 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
-webkit-box-shadow: none;
box-shadow: none;
}
/* line 255, ../sass/_layout.scss */
/* line 248, ../sass/_layout.scss */
#header nav#main-nav ul li.active a span.label-success,
#header nav#main-nav ul li a:hover span.label-success {
border: solid 1px white !important;
}
/* line 254, ../sass/_layout.scss */
#header nav#main-nav ul.submenu {
background-color: white;
}
/* line 259, ../sass/_layout.scss */
/* line 258, ../sass/_layout.scss */
#header nav#main-nav ul.submenu li a {
background-color: white;
font-size: 0.9em;
@@ -298,34 +299,34 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
box-shadow: none;
border-bottom: solid 2px #f4efe8;
}
/* line 265, ../sass/_layout.scss */
/* line 264, ../sass/_layout.scss */
#header nav#main-nav ul.submenu li a span.label {
background-color: white;
border: solid 1px #b7ab9b;
color: #b7ab9b;
}
/* line 272, ../sass/_layout.scss */
/* line 271, ../sass/_layout.scss */
#header nav#main-nav ul.submenu li.active a,
#header nav#main-nav ul.submenu li a:hover {
color: black;
background-color: white;
border-bottom: solid 2px #b7ab9b;
}
/* line 282, ../sass/_layout.scss */
/* line 281, ../sass/_layout.scss */
#header nav#main-nav #user {
color: #ee6f42;
float: right;
padding: 10px;
}

/* line 290, ../sass/_layout.scss */
/* line 289, ../sass/_layout.scss */
#main {
padding: 0px;
padding-top: 38px;
margin-bottom: 50px;
background-color: white;
}
/* line 296, ../sass/_layout.scss */
/* line 295, ../sass/_layout.scss */
#main #banner {
height: 180px;
overflow: hidden;
@@ -333,7 +334,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
background-size: cover;
background-position: center;
}
/* line 304, ../sass/_layout.scss */
/* line 303, ../sass/_layout.scss */
#main #infos-producer {
display: none;
padding: 5px 10px;
@@ -343,78 +344,77 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
border-bottom: solid 1px #e0e0e0;
color: gray;
}
/* line 313, ../sass/_layout.scss */
/* line 312, ../sass/_layout.scss */
#main #infos-producer strong {
font-weight: bold;
}
/* line 317, ../sass/_layout.scss */
/* line 316, ../sass/_layout.scss */
#main #infos-producer .favorite {
float: right;
color: gray;
}
/* line 320, ../sass/_layout.scss */
/* line 319, ../sass/_layout.scss */
#main #infos-producer .favorite a {
color: black;
}
/* line 326, ../sass/_layout.scss */
/* line 325, ../sass/_layout.scss */
#main h2#page-title {
margin-top: 0px;
font-family: "worksans_bold";
font-size: 30px;
line-height: 40px;
}
/* line 337, ../sass/_layout.scss */
/* line 336, ../sass/_layout.scss */
#main #content {
padding: 40px;
min-height: 300px;
}
/* line 341, ../sass/_layout.scss */
/* line 340, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "worksans_bold";
margin-bottom: 20px;
}
/* line 345, ../sass/_layout.scss */
/* line 344, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px;
}
/* line 350, ../sass/_layout.scss */
/* line 349, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 354, ../sass/_layout.scss */
/* line 353, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 358, ../sass/_layout.scss */
/* line 357, ../sass/_layout.scss */
#main #content h3 {
font-size: 23px;
font-size: 1.4em;
text-align: left;
margin-bottom: 30px;
margin-top: 45px;
}
/* line 364, ../sass/_layout.scss */
/* line 362, ../sass/_layout.scss */
#main #content h3 span {
padding-top: 14px;
color: black;
}
/* line 370, ../sass/_layout.scss */
/* line 368, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 374, ../sass/_layout.scss */
/* line 372, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 378, ../sass/_layout.scss */
/* line 376, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}
/* line 384, ../sass/_layout.scss */
/* line 382, ../sass/_layout.scss */
#main #content form .form-group .hint-block {
color: gray;
}

/* line 392, ../sass/_layout.scss */
/* line 390, ../sass/_layout.scss */
#footer-producer {
text-align: center;
position: absolute;
@@ -422,39 +422,39 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 0px;
width: 100%;
}
/* line 399, ../sass/_layout.scss */
/* line 397, ../sass/_layout.scss */
#footer-producer a {
color: #ee6f42;
}
/* line 401, ../sass/_layout.scss */
/* line 399, ../sass/_layout.scss */
#footer-producer a:active {
text-decoration: underline;
}

/* line 407, ../sass/_layout.scss */
/* line 405, ../sass/_layout.scss */
#footer {
display: none;
height: 100px;
float: right;
text-align: center;
}
/* line 413, ../sass/_layout.scss */
/* line 411, ../sass/_layout.scss */
#footer .content {
padding-top: 20px;
color: black;
}
/* line 417, ../sass/_layout.scss */
/* line 415, ../sass/_layout.scss */
#footer .content a {
color: black;
font-size: 18px;
padding-left: 10px;
padding-right: 10px;
}
/* line 423, ../sass/_layout.scss */
/* line 421, ../sass/_layout.scss */
#footer .content a:hover {
text-decoration: underline;
}
/* line 430, ../sass/_layout.scss */
/* line 428, ../sass/_layout.scss */
#footer #code-source img {
height: 20px;
}
@@ -516,6 +516,10 @@ termes.
color: black;
text-decoration: underline;
}
/* line 62, ../sass/site/_index.scss */
.site-index #presentation .description p:last-child {
margin-bottom: 0px;
}

/* line 4, ../sass/site/_products.scss */
.site-products #products td.photo {
@@ -1222,15 +1226,18 @@ termes.
/* line 41, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul {
height: 70px;
list-style-type: none;
padding: 0px;
margin-bottom: 40px;
}
/* line 44, ../sass/order/_order.scss */
/* line 47, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li {
text-align: center;
padding-right: 8px;
padding-left: 8px;
position: relative;
}
/* line 50, ../sass/order/_order.scss */
/* line 53, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .info-step {
position: absolute;
top: 45px;
@@ -1241,26 +1248,26 @@ termes.
font-size: 17px;
font-weight: bold;
}
/* line 61, ../sass/order/_order.scss */
/* line 64, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .glyphicon-chevron-right, .order-order #main #app-order-order #steps ul li.active .glyphicon-chevron-right {
float: right;
color: gray;
position: relative;
top: 10px;
}
/* line 69, ../sass/order/_order.scss */
/* line 72, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li.first {
padding-left: 0px;
}
/* line 73, ../sass/order/_order.scss */
/* line 76, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li#step-payment {
padding-right: 0px;
}
/* line 77, ../sass/order/_order.scss */
/* line 80, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li#step-products .btn::after, .order-order #main #app-order-order #steps ul li.first .btn::before {
display: none;
}
/* line 82, ../sass/order/_order.scss */
/* line 85, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn {
color: #333;
text-transform: uppercase;
@@ -1274,29 +1281,25 @@ termes.
border: 0px none;
text-transform: uppercase;
}
/* line 93, ../sass/order/_order.scss */
/* line 96, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn .button-content {
position: relative;
left: 8px;
}
/* line 98, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn.btn-primary {
background-color: #ee6f42;
}
/* line 102, ../sass/order/_order.scss */
/* line 101, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::after, .order-order #main #app-order-order #steps ul li .btn::before {
content: "";
position: absolute;
top: -1px;
}
/* line 108, ../sass/order/_order.scss */
/* line 107, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::after {
right: -34px;
border: 17px solid transparent;
border-left: 17px solid #e0e0e0;
background-color: transparent;
}
/* line 115, ../sass/order/_order.scss */
/* line 114, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn::before {
left: 0px;
border: 17px solid transparent;
@@ -1304,104 +1307,100 @@ termes.
background-color: transparent;
}
/* line 122, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn.btn-primary::after {
border-left: 17px solid #ee6f42;
}
/* line 136, ../sass/order/_order.scss */
.order-order #main #app-order-order #steps ul li .btn-primary {
color: white;
}
/* line 144, ../sass/order/_order.scss */
/* line 130, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #order-date-color,
.order-order #main #app-order-order #legend #distribution-date-color {
width: 13px;
height: 13px;
display: inline-block;
}
/* line 151, ../sass/order/_order.scss */
/* line 137, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #order-date-color {
background-color: #ee6f42;
}
/* line 154, ../sass/order/_order.scss */
/* line 140, ../sass/order/_order.scss */
.order-order #main #app-order-order #legend #distribution-date-color {
background-color: #5cb85c;
}
/* line 159, ../sass/order/_order.scss */
/* line 145, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar {
margin-bottom: 15px;
}
/* line 161, ../sass/order/_order.scss */
/* line 147, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-header .c-title-layout .c-title-popover .c-title-anchor .c-title[data-v-2083cb72] {
font-size: 2rem;
}
/* line 164, ../sass/order/_order.scss */
/* line 150, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day-background {
padding: 20px;
}
/* line 169, ../sass/order/_order.scss */
/* line 155, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day:hover .c-day-background {
background-color: #ee6f42 !important;
color: white !important;
}
/* line 175, ../sass/order/_order.scss */
/* line 161, ../sass/order/_order.scss */
.order-order #main #app-order-order #calendar .c-day-popover-content {
font-size: 1.3rem;
}
/* line 183, ../sass/order/_order.scss */
/* line 169, ../sass/order/_order.scss */
.order-order #main #app-order-order #credit-online-payment .panel .panel-heading .btn-default {
float: right;
position: relative;
top: -5px;
}
/* line 195, ../sass/order/_order.scss */
/* line 181, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .btn-primary {
float: right;
}
/* line 199, ../sass/order/_order.scss */
/* line 185, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .date {
font-size: 20px;
}
/* line 203, ../sass/order/_order.scss */
/* line 189, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-date #distributions-list .panel .point-sales {
color: gray;
font-size: 14px;
margin-top: 8px;
}
/* line 212, ../sass/order/_order.scss */
/* line 198, ../sass/order/_order.scss */
.order-order #main #app-order-order .block-actions {
text-align: right;
margin-top: 20px;
}
/* line 219, ../sass/order/_order.scss */
/* line 205, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.name .the-name {
color: black;
font-size: 20px;
line-height: 25px;
font-weight: bold;
font-size: 1.4em;
line-height: 1.6em;
font-family: 'worksans_semibold';
}
/* line 226, ../sass/order/_order.scss */
/* line 212, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.name .comment,
.order-order #main #app-order-order table#points-sale td.name .minimum-order-amount {
color: gray;
}
/* line 230, ../sass/order/_order.scss */
/* line 216, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.name .comment a,
.order-order #main #app-order-order table#points-sale td.name .minimum-order-amount a {
color: #ee6f42;
}
/* line 236, ../sass/order/_order.scss */
/* line 222, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.actions {
width: 150px;
}
/* line 238, ../sass/order/_order.scss */
/* line 224, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale td.actions button {
width: 100%;
}
/* line 244, ../sass/order/_order.scss */
/* line 230, ../sass/order/_order.scss */
.order-order #main #app-order-order table#points-sale tr.selected td {
background-color: white;
}
/* line 252, ../sass/order/_order.scss */
/* line 238, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name {
font-family: "worksans_bold";
font-size: 22px;
@@ -1409,12 +1408,12 @@ termes.
text-transform: uppercase;
padding-top: 13px;
}
/* line 259, ../sass/order/_order.scss */
/* line 245, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-bottom,
.order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-right {
font-size: 15px;
}
/* line 264, ../sass/order/_order.scss */
/* line 250, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name span.label {
font-family: "Arial";
font-weight: normal;
@@ -1422,17 +1421,17 @@ termes.
text-transform: none;
margin-left: 15px;
}
/* line 272, ../sass/order/_order.scss */
/* line 258, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.category-name:hover {
cursor: pointer;
background-color: #ee6f42;
color: white;
}
/* line 280, ../sass/order/_order.scss */
/* line 266, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products td.photo img {
width: 100px;
}
/* line 290, ../sass/order/_order.scss */
/* line 276, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices {
margin-top: 10px;
font-size: 10px;
@@ -1440,41 +1439,53 @@ termes.
padding-bottom: 2px;
margin-bottom: 0px;
}
/* line 298, ../sass/order/_order.scss */
/* line 284, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li {
margin-bottom: 5px;
}
/* line 300, ../sass/order/_order.scss */
/* line 286, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li strong {
font-weight: bold;
}
/* line 308, ../sass/order/_order.scss */
/* line 294, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit, .order-order #main #app-order-order table#products .price-total {
width: 135px;
text-align: center;
}
/* line 312, ../sass/order/_order.scss */
/* line 298, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .price-unit .price-infos, .order-order #main #app-order-order table#products .price-total .price-infos {
color: gray;
font-size: 13px;
line-height: 15px;
}
/* line 318, ../sass/order/_order.scss */
/* line 304, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity {
width: 175px;
}
/* line 320, ../sass/order/_order.scss */
/* line 307, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity input.quantity,
.order-order #main #app-order-order table#products .td-quantity .input-group-text {
background-color: white;
}
/* line 312, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity input.quantity {
text-align: center;
border-right: 0px none;
border: 0px none;
}
/* line 324, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity .input-group-addon {
padding: 5px;
padding-left: 0px;
/* line 316, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity .input-group-text {
border: 0px none;
padding-right: 10px;
margin: 0px;
border-left: 0px none;
border-right: 0px none;
}
/* line 323, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity .input-group-btn button {
padding: 5px;
}
/* line 325, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products .td-quantity .input-group-btn button .bi {
font-size: 1.7em;
font-weight: bold;
}
/* line 335, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products tr.total .summary h3 {
@@ -1523,19 +1534,14 @@ termes.
}
/* line 393, ../sass/order/_order.scss */
.order-order #main #app-order-order #specific-delays {
margin-top: 15px;
margin-top: 30px;
}
/* line 401, ../sass/order/_order.scss */
/* line 397, ../sass/order/_order.scss */
.order-order #main #app-order-order #infos {
margin-top: 30px;
}
/* line 403, ../sass/order/_order.scss */
.order-order #main #app-order-order #infos .panel-body {
padding-top: 0px;
white-space: pre-line;
}

/* line 413, ../sass/order/_order.scss */
/* line 405, ../sass/order/_order.scss */
#main #content .panel h3 {
font-family: "worksans_bold";
margin: 0px;
@@ -1545,67 +1551,31 @@ termes.
}

/* line 5, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert.alert-success .glyphicon-big {
background-color: #00A65A;
}
/* line 11, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert.alert-info .glyphicon-big {
background-color: #0097BC;
padding: 55px 30px;
}
/* line 17, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert.alert-info .content .glyphicon {
margin-right: 5px;
.order-confirm #main #order-success .alert-order-summary ul {
padding: 0px;
margin: 0px;
list-style-type: none;
}
/* line 25, ../sass/order/_confirm.scss */
/* line 9, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert-order-summary ul li {
margin-bottom: 10px;
}
/* line 31, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert {
padding: 0px;
}
/* line 34, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert.alert-danger {
padding: 12px;
/* line 13, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert-order-summary p {
margin-bottom: 0px;
}
/* line 36, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert.alert-danger h5 {
/* line 16, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert-order-summary div.summary {
margin-top: 10px;
margin-bottom: 10px;
}
/* line 42, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert strong {
font-weight: bold;
}
/* line 46, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert .glyphicon-big {
font-size: 90px;
color: white;
padding: 30px;
float: left;
}
/* line 53, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert div.content {
color: #333;
padding: 20px;
margin-left: 151px;
}
/* line 58, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert div.content h3 {
font-size: 30px;
color: #333;
margin-bottom: 20px;
margin-top: 0px;
margin-left: 0px;
text-align: left;
padding-left: 0px;
line-height: 35px;
text-transform: none;
/* line 23, ../sass/order/_confirm.scss */
.order-confirm #main .card-payment-infos {
margin-top: 30px;
}
/* line 70, ../sass/order/_confirm.scss */
.order-confirm #main #order-success .alert div.content .locality {
color: gray;
/* line 27, ../sass/order/_confirm.scss */
.order-confirm #main .card-infos {
margin-top: 30px;
}

/* line 3, ../sass/credit/_add.scss */
@@ -1639,6 +1609,18 @@ termes.
}

/* line 5, ../sass/credit/_history.scss */
.credit-history #content #credit-user {
float: right;
/*display: block;
padding: 10px 30px;
background-color: $color-gray-light;
@include border-radius(30px);*/
}
/* line 12, ../sass/credit/_history.scss */
.credit-history #content #credit-user .bi {
display: none;
}
/* line 18, ../sass/credit/_history.scss */
.credit-history #content .table span.payment-positive {
display: inline-block;
font-family: 'worksans_bold';
@@ -1648,7 +1630,7 @@ termes.
-webkit-border-radius: 15px;
border-radius: 15px;
}
/* line 12, ../sass/credit/_history.scss */
/* line 25, ../sass/credit/_history.scss */
.credit-history #content .table small {
color: gray;
}
@@ -1759,8 +1741,8 @@ termes.
font-weight: bold;
}
/* line 88, ../sass/subscription/_form.scss */
.subscription-create .subscription-form .products td.quantity .input-group-addon,
.subscription-update .subscription-form .products td.quantity .input-group-addon {
.subscription-create .subscription-form .products td.quantity .input-group-text,
.subscription-update .subscription-form .products td.quantity .input-group-text {
background-color: white;
padding-left: 0px;
border-left: 0px none;
@@ -1936,7 +1918,7 @@ termes.
text-align: left !important;
}
/* line 143, ../sass/_responsive.scss */
#main #products .td-quantity .input-group .input-group-addon {
#main #products .td-quantity .input-group .input-group-text {
position: absolute;
top: 37px;
right: 15px;

+ 5
- 7
producer/web/sass/_layout.scss Näytä tiedosto

@@ -237,11 +237,6 @@ ul.pagination {
line-height: 0.8em;
text-transform: uppercase;
border: solid 1px transparent;


&.label-success {
border: solid 1px white;
}
}
}

@@ -249,6 +244,10 @@ ul.pagination {
a:hover {
color: white;
@include box-shadow(none);

span.label-success {
border: solid 1px white !important;
}
}
}

@@ -356,10 +355,9 @@ ul.pagination {
}
h3 {
font-size: 23px ;
font-size: 1.4em ;
text-align: left ;
margin-bottom: 30px ;
margin-top: 45px ;
span {
padding-top: 14px ;

+ 1
- 1
producer/web/sass/_responsive.scss Näytä tiedosto

@@ -140,7 +140,7 @@ termes.
.form-control.quantity {
text-align: left !important;
}
.input-group-addon {
.input-group-text {
position: absolute;
top: 37px;
right: 15px;

+ 13
- 0
producer/web/sass/credit/_history.scss Näytä tiedosto

@@ -1,6 +1,19 @@

.credit-history {
#content {

#credit-user {
float: right;
/*display: block;
padding: 10px 30px;
background-color: $color-gray-light;
@include border-radius(30px);*/

.bi {
display: none;
}
}

.table {
span.payment-positive {
display: inline-block;

+ 15
- 62
producer/web/sass/order/_confirm.scss Näytä tiedosto

@@ -1,77 +1,30 @@

.order-confirm #main {
#order-success {
.alert.alert-success {
.glyphicon-big {
background-color: #00A65A ;
}
}

.alert.alert-info {
.glyphicon-big {
background-color: #0097BC ;
padding: 55px 30px ;
}
.content {
.glyphicon {
margin-right: 5px ;
}
}
}

.alert-order-summary {
ul {
padding: 0px;
margin: 0px;
list-style-type: none;
li {
margin-bottom: 10px ;
}
}
}

.alert {
padding: 0px ;

&.alert-danger {
padding: 12px;
h5 {
margin-top: 10px;
margin-bottom: 10px;
}
p {
margin-bottom: 0px;
}

strong {
font-weight: bold ;
}

.glyphicon-big {
font-size: 90px ;
color: white ;
padding: 30px ;
float: left ;
div.summary {
margin-top: 10px;
margin-bottom: 10px;
}
}
}

div.content {
color: #333 ;
padding: 20px ;
margin-left: 151px ;

h3 {
font-size: 30px ;
color: #333 ;
margin-bottom: 20px ;
margin-top: 0px ;
margin-left: 0px ;
text-align: left ;
padding-left: 0px ;
line-height: 35px ;
text-transform: none ;
}
.card-payment-infos {
margin-top: 30px;
}

.locality {
color: gray ;
}
}
}
.card-infos {
margin-top: 30px;
}
}

+ 27
- 35
producer/web/sass/order/_order.scss Näytä tiedosto

@@ -40,6 +40,9 @@
margin-bottom: 20px ;
ul {
height: 70px ;
list-style-type: none;
padding: 0px;
margin-bottom: 40px;
li {
text-align: center ;
@@ -95,10 +98,6 @@
left: 8px ;
}
&.btn-primary {
background-color: $color-primary ;
}
&::after, &::before {
content: '' ;
position: absolute ;
@@ -118,19 +117,6 @@
border-left:17px solid white;
background-color: transparent ;
}
&.btn-primary::after {
border-left:17px solid $color-primary;
}
&:hover {
//background-color: lighten($color-primary, 5) ;
}
&:hover::after {
//border:17px solid transparent;
//border-left:17px solid #fefefe;
}
}
.btn-primary {
@@ -218,9 +204,9 @@
td.name {
.the-name {
color: black ;
font-size: 20px ;
line-height: 25px ;
font-weight: bold;
font-size: 1.4em ;
line-height: 1.6em ;
font-family: 'worksans_semibold';
}

.comment,
@@ -317,16 +303,30 @@
}
.td-quantity {
width: 175px ;

input.quantity,
.input-group-text {
background-color: white;
}

input.quantity {
text-align: center ;
border-right: 0px none ;
border: 0px none;
}
.input-group-addon {
padding: 5px ;
padding-left: 0px ;
.input-group-text {
border: 0px none;
padding-right: 10px ;
margin: 0px ;
border-left: 0px none ;
border-right: 0px none ;
}

.input-group-btn {
button {
padding: 5px;
.bi {
font-size: 1.7em;
font-weight: bold;
}
}
}
}
@@ -391,19 +391,11 @@
}

#specific-delays {
margin-top: 15px;

strong {
//text-decoration: underline ;
}
margin-top: 30px;
}

#infos {
margin-top: 30px ;
.panel-body {
padding-top: 0px ;
white-space: pre-line ;
}
}
}
}

+ 4
- 0
producer/web/sass/site/_index.scss Näytä tiedosto

@@ -58,6 +58,10 @@ termes.
color: black;
text-decoration: underline;
}

p:last-child {
margin-bottom: 0px;
}
}
}
}

+ 1
- 1
producer/web/sass/subscription/_form.scss Näytä tiedosto

@@ -85,7 +85,7 @@
}
}
.input-group-addon {
.input-group-text {
background-color: white ;
padding-left: 0px ;
border-left: 0px none ;

Write Preview
Loading…
Peruuta
Tallenna