浏览代码

Ajustements abonnements + alerte si commande sur un jour de distribution qui n'est pas activé

dev
Guillaume 3 年前
父节点
当前提交
a4d27b1456
共有 3 个文件被更改,包括 17 次插入12 次删除
  1. +4
    -0
      backend/views/distribution/index.php
  2. +1
    -1
      common/models/Subscription.php
  3. +12
    -11
      producer/views/order/order.php

+ 4
- 0
backend/views/distribution/index.php 查看文件

@@ -282,6 +282,10 @@ $this->setPageTitle('Distributions') ;
</ul>
</div>

<div class="alert alert-danger" v-if="distribution && !distribution.active && orders && orders.length > 0">
Attention, ce jour de distribution n'est pas activé et vous avez quand même des commandes enregistrées.
</div>

<table class="table table-condensed table-bordered table-hover" v-if="countOrdersByPointSale[idActivePointSale] > 0 || (idActivePointSale == 0 && orders.length > 0)">
<thead>
<tr>

+ 1
- 1
common/models/Subscription.php 查看文件

@@ -178,7 +178,7 @@ class Subscription extends ActiveRecordCommon
'distribution.date' => date('Y-m-d', strtotime($date))
]);

if ($distribution && count($this->productSubscription) && $this->id_point_sale) {
if ($distribution && $distribution->active && count($this->productSubscription) && $this->id_point_sale) {
// commande
$order = new Order;
if (strlen($this->username)) {

+ 12
- 11
producer/views/order/order.php 查看文件

@@ -142,17 +142,18 @@ $producer = GlobalParam::getCurrentProducer() ;
</div>
<div id="calendar">
<v-calendar
is-inline
is-double-paned
is-expanded
v-model="date"
mode="single"
firstDayOfWeek="1"
:formats="calendar.formats"
:theme-styles="calendar.themeStyles"
:attributes="calendar.attrs"
:available-dates="calendar.availableDates"
@dayclick='dayClick'>
is-inline
is-double-paned
is-expanded
v-model="date"
mode="single"
locale="fr"
:locale="{id: 'fr', firstDayOfWeek: 2, masks: { weekdays: 'WW' }}"
:formats="calendar.formats"
:theme-styles="calendar.themeStyles"
:attributes="calendar.attrs"
:available-dates="calendar.availableDates"
@dayclick='dayClick'
></v-calendar>
</div>
<?php if($producer->behavior_order_select_distribution == Producer::BEHAVIOR_ORDER_SELECT_DISTRIBUTION_LIST ): ?>

正在加载...
取消
保存