Преглед изворни кода

[backend] Distributions : gestion des abonnements manquants

refactoring
Guillaume пре 3 година
родитељ
комит
49a1d48d8c
5 измењених фајлова са 29 додато и 1 уклоњено
  1. +11
    -0
      backend/controllers/DistributionController.php
  2. +7
    -0
      backend/views/distribution/index.php
  3. +2
    -1
      backend/web/js/vuejs/distribution-index.js
  4. +9
    -0
      common/models/Subscription.php
  5. +0
    -0
      producer/web/assets/.gitignore

+ 11
- 0
backend/controllers/DistributionController.php Прегледај датотеку

$tiller = new Tiller(); $tiller = new Tiller();
$json['tiller_is_synchro'] = (int)$tiller->isSynchro($date); $json['tiller_is_synchro'] = (int)$tiller->isSynchro($date);
} }

// abonnements manquants
$arraySubscriptions = Subscription::searchByDate($date);
$json['missing_subscriptions'] = [] ;
foreach ($arraySubscriptions as $subscription) {
if (!$subscription->hasOrderAlreadyExist($ordersArrayObject)) {
$json['missing_subscriptions'][] = [
'username' => $subscription->getUsername()
] ;
}
}
} }


return $json; return $json;

+ 7
- 0
backend/views/distribution/index.php Прегледај датотеку

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


<div class="alert alert-danger" v-if="missingSubscriptions.length > 0">
{{ missingSubscriptions.length }} abonnement<template v-if="missingSubscriptions.length > 1">s</template> manquant<template v-if="missingSubscriptions.length > 1">s</template> :
<ul>
<li v-for="subscription in missingSubscriptions">{{ subscription.username }}</li>
</ul>
</div>

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

+ 2
- 1
backend/web/js/vuejs/distribution-index.js Прегледај датотеку

tillerIsSynchro: false, tillerIsSynchro: false,
checkboxSelectAllOrders: false, checkboxSelectAllOrders: false,
messageGenerateDeliveryNoteDisplayed: false, messageGenerateDeliveryNoteDisplayed: false,
missingSubscriptions: false,
calendar: { calendar: {
mode: 'single', mode: 'single',
attrs: [], attrs: [],
app.initCountActiveProducts() ; app.initCountActiveProducts() ;
app.meansPayment = response.data.means_payment ; app.meansPayment = response.data.means_payment ;
app.oneDistributionWeekActive = response.data.one_distribution_week_active ; app.oneDistributionWeekActive = response.data.one_distribution_week_active ;
app.missingSubscriptions = response.data.missing_subscriptions ;
app.countOrders = 0 ; app.countOrders = 0 ;
if(response.data.orders) { if(response.data.orders) {
app.orders = JSON.parse(JSON.stringify(response.data.orders)) ; app.orders = JSON.parse(JSON.stringify(response.data.orders)) ;

+ 9
- 0
common/models/Subscription.php Прегледај датотеку

} }
} }


public function getUsername()
{
if($this->user) {
return $this->user->getUsername() ;
}

return $this->username ;
}



} }

+ 0
- 0
producer/web/assets/.gitignore Прегледај датотеку


Loading…
Откажи
Сачувај