Bladeren bron

Merge branch 'develop'

prodstable
Guillaume Bourgeois 1 jaar geleden
bovenliggende
commit
b9090a4c16
4 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. +1
    -1
      common/models/SubscriptionForm.php
  2. +1
    -2
      producer/controllers/SubscriptionController.php
  3. +1
    -1
      producer/views/subscription/_form.php
  4. +2
    -1
      producer/web/js/vuejs/subscription-form.js

+ 1
- 1
common/models/SubscriptionForm.php Bestand weergeven

$subscription->saturday = $this->saturday; $subscription->saturday = $this->saturday;
$subscription->sunday = $this->sunday; $subscription->sunday = $this->sunday;
$subscription->week_frequency = $this->week_frequency; $subscription->week_frequency = $this->week_frequency;
$subscription->auto_payment = $this->auto_payment;
$subscription->auto_payment = (int) $this->auto_payment;
$subscription->comment = $this->comment; $subscription->comment = $this->comment;


$subscription->save(); $subscription->save();

+ 1
- 2
producer/controllers/SubscriptionController.php Bestand weergeven

} }
} }


if ($model->load($posts) && $model->validate()
&& $model->save()) {
if ($model->load($posts) && $model->validate() && $model->save()) {
$subscription = Subscription::searchOne([ $subscription = Subscription::searchOne([
'id' => $model->id 'id' => $model->id
]); ]);

+ 1
- 1
producer/views/subscription/_form.php Bestand weergeven

<?php if(Producer::getConfig('credit')): ?> <?php if(Producer::getConfig('credit')): ?>
<div class="form-group field-subscriptionform-auto_payment"> <div class="form-group field-subscriptionform-auto_payment">
<label><input type="checkbox" id="subscriptionform-auto_payment" name="SubscriptionForm[auto_payment]" v-model="autoPayment"> Paiement automatique</label> <label><input type="checkbox" id="subscriptionform-auto_payment" name="SubscriptionForm[auto_payment]" v-model="autoPayment"> Paiement automatique</label>
<div class="hint-block">Cochez cette case si vous souhaitez que votre Crédit soit automatiquement débité.</div>
<div class="hint-block">Cochez cette case si vous souhaitez que votre Crédit soit automatiquement débité.</div>
<div class="help-block"></div> <div class="help-block"></div>
</div> </div>
<?php endif; ?> <?php endif; ?>

+ 2
- 1
producer/web/js/vuejs/subscription-form.js Bestand weergeven

} }
} }


console.log(this.autoPayment);
axios.post('ajax-process', { axios.post('ajax-process', {
idSubscription: this.idSubscription, idSubscription: this.idSubscription,
SubscriptionForm: { SubscriptionForm: {
date_begin: this.dateBegin ? this.formatDate(this.dateBegin) : '', date_begin: this.dateBegin ? this.formatDate(this.dateBegin) : '',
date_end: this.dateEnd ? this.formatDate(this.dateEnd) : '', date_end: this.dateEnd ? this.formatDate(this.dateEnd) : '',
week_frequency: this.weekFrequency, week_frequency: this.weekFrequency,
auto_payment: parseInt(this.autoPayment),
auto_payment: this.autoPayment ? 1 : 0,
monday: this.monday == true ? 1 : 0, monday: this.monday == true ? 1 : 0,
tuesday: this.tuesday == true ? 1 : 0, tuesday: this.tuesday == true ? 1 : 0,
wednesday: this.wednesday == true ? 1 : 0, wednesday: this.wednesday == true ? 1 : 0,

Laden…
Annuleren
Opslaan