Browse Source

Merge branch 'dev'

prodstable
Guillaume 2 years ago
parent
commit
0644814aac
2 changed files with 897 additions and 880 deletions
  1. +1
    -1
      backend/web/js/vuejs/distribution-index.js
  2. +896
    -879
      common/models/Order.php

+ 1
- 1
backend/web/js/vuejs/distribution-index.js View File

@@ -713,7 +713,7 @@ Vue.component('order-form',{
data.append('idUser', this.order.id_user) ;
data.append('username', ''+this.order.username) ;
data.append('products', JSON.stringify(this.order.productOrder)) ;
data.append('comment', this.order.comment) ;
data.append('comment', this.order.comment && this.order.comment.length ? this.order.comment : '') ;
data.append('processCredit', processCredit) ;

axios.post(UrlManager.getBaseUrlAbsolute()+"order/ajax-update",data)

+ 896
- 879
common/models/Order.php
File diff suppressed because it is too large
View File


Loading…
Cancel
Save