Browse Source

Merge branch 'master' into dev

refactoring
Guillaume 3 years ago
parent
commit
27472000b1
4 changed files with 6 additions and 4 deletions
  1. +1
    -0
      backend/views/layouts/main.php
  2. +2
    -1
      producer/views/layouts/main.php
  3. +2
    -2
      producer/views/order/order.php
  4. +1
    -1
      producer/web/js/vuejs/order-order.js

+ 1
- 0
backend/views/layouts/main.php View File



</div> </div>


<script type="text/javascript" src="https://cdn.polyfill.io/v3/polyfill.min.js?features=Intl.~locale.fr"></script>
<?php $this->endBody() ?> <?php $this->endBody() ?>
<?= $this->render('@common/views/_analytics.php'); ?> <?= $this->render('@common/views/_analytics.php'); ?>



+ 2
- 1
producer/views/layouts/main.php View File

?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="fr-FR">
<head> <head>
<title><?= Html::encode($producer->name); ?> | <?= $this->getPageTitle(); ?></title> <title><?= Html::encode($producer->name); ?> | <?= $this->getPageTitle(); ?></title>
<meta charset="utf-8"> <meta charset="utf-8">
src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-diaspora.png" alt="Diaspora"/></a> src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-diaspora.png" alt="Diaspora"/></a>
</div> </div>
</footer> </footer>
<script type="text/javascript" src="https://cdn.polyfill.io/v3/polyfill.min.js?features=Intl.~locale.fr"></script>
<?php $this->endBody() ?> <?php $this->endBody() ?>
<?= $this->render('@common/views/_analytics.php'); ?> <?= $this->render('@common/views/_analytics.php'); ?>
</body> </body>

+ 2
- 2
producer/views/order/order.php View File

is-expanded is-expanded
v-model="date" v-model="date"
mode="single" mode="single"
locale="fr"
:locale="{id: 'fr', firstDayOfWeek: 2, masks: { weekdays: 'WW' }}"
locale="fr-FR"
:locale="{ id: 'fr_FR', firstDayOfWeek: 1, masks: { weekdays: 'WW' } }"
:formats="calendar.formats" :formats="calendar.formats"
:theme-styles="calendar.themeStyles" :theme-styles="calendar.themeStyles"
:attributes="calendar.attrs" :attributes="calendar.attrs"

+ 1
- 1
producer/web/js/vuejs/order-order.js View File




var app = new Vue({ var app = new Vue({
el: '#app-order-order', el: '#app-order-order',
data() { data() {
}, window.appInitValues); }, window.appInitValues);
}, },
mounted: function() { mounted: function() {

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


if(dateDefined) { if(dateDefined) {

Loading…
Cancel
Save