소스 검색

[Frontend] Récap après commande : ajouter infos horaires du point de vente #165

refactoring
Guillaume 2 년 전
부모
커밋
dea58e1998
3개의 변경된 파일15개의 추가작업 그리고 2개의 파일을 삭제
  1. +8
    -0
      producer/views/order/confirm.php
  2. +3
    -2
      producer/views/order/order.php
  3. +4
    -0
      producer/web/js/vuejs/order-order.js

+ 8
- 0
producer/views/order/confirm.php 파일 보기

@@ -91,6 +91,14 @@ $producer = GlobalParam::getCurrentProducer() ;
<br />&nbsp; &nbsp; &nbsp;<span class="locality">à <?= Html::encode($order->pointSale->locality) ?></span><?php endif; ?>
<?php endif; ?>
</li>
<?php
$strInfos = $order->pointSale->getStrInfos(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">

+ 3
- 2
producer/views/order/order.php 파일 보기

@@ -147,8 +147,9 @@ $producer = GlobalParam::getCurrentProducer() ;
is-expanded
v-model="date"
mode="single"
locale="fr-FR"
:locale="{ id: 'fr_FR', firstDayOfWeek: 1, masks: { weekdays: 'WW' } }"
locale="fr"
:locale="{ id: 'fr', firstDayOfWeek: 1, masks: { weekdays: 'WW' } }"
:first-day-of-week="1"
:formats="calendar.formats"
:theme-styles="calendar.themeStyles"
:attributes="calendar.attrs"

+ 4
- 0
producer/web/js/vuejs/order-order.js 파일 보기

@@ -67,6 +67,10 @@ var app = new Vue({
}, window.appInitValues);
},
mounted: function() {

let fr = new Intl.Locale("fr-FR");
console.log(fr);

var dateDefined = $('#order-distribution-date').size() || $('#distribution-date').size() ;

if(dateDefined) {

Loading…
취소
저장