Laclic
/
Souke
보기 5
좋아요 0
포크 1
코드 이슈 1 풀 리퀘스트 0 릴리즈 0 위키 Activity
소스 검색

Boutique : correctifs divers

feature/rotating_product
Guillaume Bourgeois 7 달 전
부모
5bdf65d781
커밋
1b637c3932
7개의 변경된 파일과 126개의 추가작업 그리고 111개의 파일을 삭제
분할 보기 변경상태 보기
  1. +63
    -56
      common/web/css/screen.css
  2. +5
    -0
      common/web/sass/_common.scss
  3. +47
    -36
      producer/views/order/order.php
  4. +1
    -1
      producer/views/site/points-sale.php
  5. +4
    -7
      producer/web/css/screen.css
  6. +5
    -2
      producer/web/js/vuejs/order-order.js
  7. +1
    -9
      producer/web/sass/order/_order.scss

+ 63
- 56
common/web/css/screen.css 파일 보기

@@ -143,6 +143,7 @@ termes.
#main {
/* Boutons */
/* Alertes */
/* Card */
/* Tables */
/* Formulaires */
}
@@ -221,65 +222,71 @@ termes.
#main .alert p:last-child {
margin-bottom: 0px;
}
/* line 82, ../sass/_common.scss */
/* line 77, ../sass/_common.scss */
#main .card {
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 87, ../sass/_common.scss */
#main .table thead tr th {
font-family: 'worksans_semibold';
}
/* line 92, ../sass/_common.scss */
/* line 97, ../sass/_common.scss */
#main .table.table-striped {
border: 0px none;
}
/* line 95, ../sass/_common.scss */
/* line 100, ../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 100, ../sass/_common.scss */
/* line 105, ../sass/_common.scss */
#main .table.table-striped.table-striped > tbody > tr:nth-of-type(2n+1) > * {
background-color: #f8f7f3;
}
/* line 104, ../sass/_common.scss */
/* line 109, ../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 108, ../sass/_common.scss */
/* line 113, ../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 114, ../sass/_common.scss */
/* line 119, ../sass/_common.scss */
#main .table.table-striped thead tr {
border: 0px none;
}
/* line 116, ../sass/_common.scss */
/* line 121, ../sass/_common.scss */
#main .table.table-striped thead tr th {
border: 0px none;
padding: 10px 20px;
}
/* line 124, ../sass/_common.scss */
/* line 129, ../sass/_common.scss */
#main .table.table-striped tbody tr {
border: 0px none;
}
/* line 126, ../sass/_common.scss */
/* line 131, ../sass/_common.scss */
#main .table.table-striped tbody tr td {
border: 0px none;
padding: 20px;
}
/* line 134, ../sass/_common.scss */
/* line 139, ../sass/_common.scss */
#main .table .btn-secondary {
display: inline-block;
margin-bottom: 5px;
}
/* line 142, ../sass/_common.scss */
/* line 147, ../sass/_common.scss */
#main form .control-label {
font-family: 'worksans_medium';
}
/* line 146, ../sass/_common.scss */
/* line 151, ../sass/_common.scss */
#main form input[type="text"],
#main form input[type="email"],
#main form input[type="password"],
@@ -293,66 +300,66 @@ termes.
border-radius: 0px;
border: solid 1px #b7ab9b;
}
/* line 156, ../sass/_common.scss */
/* line 161, ../sass/_common.scss */
#main form .form-control {
-moz-appearance: auto;
-webkit-appearance: auto;
}
/* line 160, ../sass/_common.scss */
/* line 165, ../sass/_common.scss */
#main form .form-control:hover {
border: solid 1px gray;
}
/* line 164, ../sass/_common.scss */
/* line 169, ../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 170, ../sass/_common.scss */
/* line 175, ../sass/_common.scss */
#main form .has-error .control-label {
color: black;
}
/* line 174, ../sass/_common.scss */
/* line 179, ../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 179, ../sass/_common.scss */
/* line 184, ../sass/_common.scss */
#main form .has-error .help-block-error {
color: #a94442;
}
/* line 184, ../sass/_common.scss */
/* line 189, ../sass/_common.scss */
#main form .form-buttons {
text-align: right;
}

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

/* line 195, ../sass/_common.scss */
/* line 200, ../sass/_common.scss */
.float-right {
float: right;
}

/* line 199, ../sass/_common.scss */
/* line 204, ../sass/_common.scss */
.clr {
clear: both;
}

/* Navigation utilisateur en haut du site */
/* line 204, ../sass/_common.scss */
/* line 209, ../sass/_common.scss */
.container-nav-user-top {
position: relative;
z-index: 999;
background-color: white;
}
/* line 209, ../sass/_common.scss */
/* line 214, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: absolute;
top: 0px;
@@ -360,7 +367,7 @@ termes.
background-color: white;
z-index: 100;
}
/* line 216, ../sass/_common.scss */
/* line 221, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar {
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
@@ -370,16 +377,16 @@ termes.
margin: 0px;
min-height: 0px;
}
/* line 223, ../sass/_common.scss */
/* line 228, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
position: relative;
left: -10px;
}
/* line 227, ../sass/_common.scss */
/* line 232, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
padding-left: 5px;
}
/* line 230, ../sass/_common.scss */
/* line 235, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link {
padding-left: 10px;
padding-right: 10px;
@@ -389,12 +396,12 @@ termes.
color: black;
font-size: 16px;
}
/* line 239, ../sass/_common.scss */
/* line 244, ../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 244, ../sass/_common.scss */
/* line 249, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li a.nav-link .bi {
color: #ee6f42;
font-size: 16px;
@@ -402,48 +409,48 @@ termes.
position: relative;
top: 1px;
}
/* line 254, ../sass/_common.scss */
/* line 259, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li .dropdown-menu a {
padding: 2px 20px;
}
/* line 257, ../sass/_common.scss */
/* line 262, ../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 266, ../sass/_common.scss */
/* line 271, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu {
z-index: 9999;
}
/* line 268, ../sass/_common.scss */
/* line 273, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .dropdown-menu .divider.dropdown-header {
padding: 0px;
}

@media screen and (max-width: 991px) {
/* line 279, ../sass/_common.scss */
/* line 284, ../sass/_common.scss */
.container-nav-user-top .nav-user-top {
position: relative;
}
/* line 283, ../sass/_common.scss */
/* line 288, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul {
width: 100%;
display: block;
margin-right: 0px;
text-align: center;
}
/* line 289, ../sass/_common.scss */
/* line 294, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li {
display: inline-block;
}
/* line 293, ../sass/_common.scss */
/* line 298, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar ul li.nav-item-producers .dropdown-menu {
right: -95px;
}
/* line 300, ../sass/_common.scss */
/* line 305, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .link-text {
display: none;
}
/* line 304, ../sass/_common.scss */
/* line 309, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu {
position: absolute;
right: 5%;
@@ -454,32 +461,32 @@ termes.
-webkit-box-shadow: 0px 0px 4px gray;
box-shadow: 0px 0px 4px gray;
}
/* line 313, ../sass/_common.scss */
/* line 318, ../sass/_common.scss */
.container-nav-user-top .nav-user-top .navbar .dropdown-menu li a {
padding-left: 15px;
}
}
/* Block de date */
/* line 326, ../sass/_common.scss */
/* line 331, ../sass/_common.scss */
.block-date {
margin: 0px auto;
padding-top: 0px;
text-align: center;
}
/* line 331, ../sass/_common.scss */
/* line 336, ../sass/_common.scss */
.block-date .day {
text-transform: capitalize;
line-height: 15px;
font-size: 15px;
text-transform: uppercase;
}
/* line 338, ../sass/_common.scss */
/* line 343, ../sass/_common.scss */
.block-date .num {
font-size: 30px;
line-height: 35px;
font-weight: bold;
}
/* line 344, ../sass/_common.scss */
/* line 349, ../sass/_common.scss */
.block-date .month {
text-transform: uppercase;
line-height: 15px;
@@ -488,52 +495,52 @@ termes.
}

/* Page d'erreur */
/* line 354, ../sass/_common.scss */
/* line 359, ../sass/_common.scss */
#main #content .site-error .col-lg-6 {
margin: 0px auto;
float: none;
}
/* line 364, ../sass/_common.scss */
/* line 369, ../sass/_common.scss */
#main #content .site-error .panel h2 {
text-transform: none;
font-size: 25px;
margin-top: 0px;
margin-bottom: 20px;
}
/* line 371, ../sass/_common.scss */
/* line 376, ../sass/_common.scss */
#main #content .site-error .panel p:last-child {
margin-bottom: 0px;
padding-bottom: 0px;
}
/* line 377, ../sass/_common.scss */
/* line 382, ../sass/_common.scss */
#main #content .site-error .alert {
padding-bottom: 5px;
}
/* line 380, ../sass/_common.scss */
/* line 385, ../sass/_common.scss */
#main #content .site-error .alert h3 {
margin-top: 5px;
margin-bottom: 18px;
}
/* line 385, ../sass/_common.scss */
/* line 390, ../sass/_common.scss */
#main #content .site-error .alert p {
margin-bottom: 15px;
}
/* line 389, ../sass/_common.scss */
/* line 394, ../sass/_common.scss */
#main #content .site-error .alert .btn {
text-decoration: none;
}
/* line 394, ../sass/_common.scss */
/* line 399, ../sass/_common.scss */
#main #content .site-error p.error-message {
font-weight: bold;
}

/* Paiement */
/* line 400, ../sass/_common.scss */
/* line 405, ../sass/_common.scss */
.payment-detail-remaining-surplus {
font-size: 13px;
color: gray;
}
/* line 404, ../sass/_common.scss */
/* line 409, ../sass/_common.scss */
.payment-detail-remaining-surplus strong {
font-weight: bold;
}

+ 5
- 0
common/web/sass/_common.scss 파일 보기

@@ -73,6 +73,11 @@
}
}

/* Card */
.card {
@include border-radius(0px);
}

/* Tables */
$table-striped-bg-factor: black;
.table {

+ 47
- 36
producer/views/order/order.php 파일 보기

@@ -455,11 +455,19 @@ $this->setTitle('Commander');

<div id="content-step-payment">
<div>
<div class="delivery">
<div class="delivery-home" v-if="pointSaleActive.is_home_delivery">
<label for="deliver-address">Adresse de livraison</label>
<textarea id="deliver-address" v-model="deliveryAddress" class="form-control"
required="required"></textarea>
<div class="card delivery" v-if="pointSaleActive.is_home_delivery">
<div class="card-body">
<h5 class="card-title">
<label for="order-comment">
<i class="bi bi-truck"></i>
Adresse de livraison
</label>
</h5>
<div class="card-text">
<form>
<textarea id="deliver-address" v-model="deliveryAddress" class="form-control" required="required"></textarea>
</form>
</div>
</div>
</div>

@@ -473,7 +481,7 @@ $this->setTitle('Commander');
</h5>
<div class="card-text">
<form>
<textarea id="order-comment" v-model="comment" class="form-control" placeholder="Tappez ici votre commentaire ..."></textarea>
<textarea id="order-comment" v-model="comment" class="form-control"></textarea>
</form>
</div>
</div>
@@ -569,36 +577,39 @@ $this->setTitle('Commander');

<template>
<div id="signup-guest" class="card" v-if="!user && producer.option_allow_order_guest">
<div class="card-title">
<h5>Informations personnelles</h5>
</div>
<div class="card-text">
<form action="#">
<div class="form-group field-signupguest-email required">
<label class="control-label" for="signupguest-email">Email</label>
<input type="email" id="signupguest-email" class="form-control"
name="SignupForm[email]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-firstname required">
<label class="control-label" for="signupguest-firstname">Prénom</label>
<input type="text" id="signupguest-firstname" class="form-control"
name="SignupForm[firstname]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-lastname required">
<label class="control-label" for="signupguest-lastname">Nom</label>
<input type="text" id="signupguest-lastname" class="form-control"
name="SignupForm[lastname]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-phone required">
<label class="control-label" for="signupguest-phone">Téléphone</label>
<input type="text" id="signupguest-phone" class="form-control"
name="SignupForm[phone]">
<p class="help-block help-block-error"></p>
</div>
</form>
<div class="card-body">
<h5 class="card-title">
<i class="bi bi-person"></i>
Informations personnelles
</h5>
<div class="card-text">
<form action="#">
<div class="form-group field-signupguest-email required">
<label class="control-label" for="signupguest-email">Email</label>
<input type="email" id="signupguest-email" class="form-control"
name="SignupForm[email]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-firstname required">
<label class="control-label" for="signupguest-firstname">Prénom</label>
<input type="text" id="signupguest-firstname" class="form-control"
name="SignupForm[firstname]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-lastname required">
<label class="control-label" for="signupguest-lastname">Nom</label>
<input type="text" id="signupguest-lastname" class="form-control"
name="SignupForm[lastname]">
<p class="help-block help-block-error"></p>
</div>
<div class="form-group field-signupguest-phone required">
<label class="control-label" for="signupguest-phone">Téléphone</label>
<input type="text" id="signupguest-phone" class="form-control"
name="SignupForm[phone]">
<p class="help-block help-block-error"></p>
</div>
</form>
</div>
</div>
</div>
<div class="block-actions">

+ 1
- 1
producer/views/site/points-sale.php 파일 보기

@@ -77,7 +77,7 @@ $this->setPageTitle('Points de vente');
}
],
[
'label' => 'Jours',
'label' => 'Informations',
'format' => 'raw',
'contentOptions' => ['class' => 'days'],
'value' => function ($model) use ($distributionModule) {

+ 4
- 7
producer/web/css/screen.css 파일 보기

@@ -1436,6 +1436,7 @@ termes.
}
/* line 253, ../sass/order/_order.scss */
.order-order #main #app-order-order table#products {
margin-bottom: 40px;
border-top: solid 1px #b7ab9b;
border-left: solid 1px #b7ab9b;
border-right: solid 1px #b7ab9b;
@@ -1608,21 +1609,17 @@ termes.
.order-order #main #app-order-order #content-step-payment .delivery {
margin-bottom: 20px;
}
/* line 445, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .delivery .delivery-home {
margin-bottom: 20px;
}
/* line 454, ../sass/order/_order.scss */
/* line 446, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .comment {
margin-bottom: 20px;
}
/* line 459, ../sass/order/_order.scss */
/* line 451, ../sass/order/_order.scss */
.order-order #main #app-order-order #content-step-payment .credit .info {
margin-left: 20px;
color: gray;
}

/* line 472, ../sass/order/_order.scss */
/* line 464, ../sass/order/_order.scss */
#main #content .panel h3 {
font-family: "worksans_bold";
margin: 0px;

+ 5
- 2
producer/web/js/vuejs/order-order.js 파일 보기

@@ -396,7 +396,6 @@ var app = new Vue({
}
if(!this.errors.length) {
this.step = step ;
window.scroll(0, $('#page-title').position().top - 25) ;
this.init('basic', oldStep, step) ;
}
},
@@ -692,17 +691,21 @@ var app = new Vue({
return count ;
},
setCategoryCurrent: function(category, first) {
var idScroll = 'products';
if(this.categoryCurrent && this.categoryCurrent.id == category.id && !first) {
this.categoryCurrent = null ;
}
else {
this.categoryCurrent = category ;
if(!first) {
idScroll = 'category'+this.categoryCurrent.id;
}
}

setTimeout(function() {
opendistrib_products();
}, 500);
setTimeout(opendistrib_scroll, 250, 'category'+this.categoryCurrent.id);
setTimeout(opendistrib_scroll, 250, idScroll);
}
},
computed : {

+ 1
- 9
producer/web/sass/order/_order.scss 파일 보기

@@ -251,7 +251,7 @@
}
table#products {
margin-bottom: 40px;
border-top: solid 1px $color-gray-dark;
border-left: solid 1px $color-gray-dark;
border-right: solid 1px $color-gray-dark;
@@ -441,14 +441,6 @@
#content-step-payment {
.delivery {
margin-bottom: 20px ;

.delivery-home {
margin-bottom: 20px ;
}

.delivery-address {

}
}

.comment {

Write Preview
Loading…
취소
저장