Browse Source

Merge branch 'dev'

master
Guillaume Bourgeois 5 years ago
parent
commit
2d56526495
3 changed files with 19 additions and 3 deletions
  1. +14
    -0
      frontend/web/js/frontend.js
  2. +4
    -2
      producer/controllers/OrderController.php
  3. +1
    -1
      producer/web/js/producer.js

+ 14
- 0
frontend/web/js/frontend.js View File

$('#option-user, #option-producer').change(function() { $('#option-user, #option-producer').change(function() {
opendistrib_signup_fields_producer() ; opendistrib_signup_fields_producer() ;
}) ; }) ;
opendistrib_signup_code_producer() ;
$('#signupform-id_producer').change(function() {
opendistrib_signup_code_producer() ;
}) ;
} }
} }


} }
} }


function opendistrib_signup_code_producer() {
if($('#signupform-id_producer option:selected').hasClass('lock')){
$('#bloc-code-acces').fadeIn() ;
}
else {
$('#bloc-code-acces').hide() ;
}
}




+ 4
- 2
producer/controllers/OrderController.php View File

$favoritePointSale = User::getCurrent()->getFavoritePointSale() ; $favoritePointSale = User::getCurrent()->getFavoritePointSale() ;
if($favoritePointSale) {
/*if($favoritePointSale) {
$newPointSaleArray = [] ; $newPointSaleArray = [] ;
foreach($pointsSaleArray as $pointSale) { foreach($pointsSaleArray as $pointSale) {
} }
else { else {
$newPointSaleArray = $pointsSaleArray ; $newPointSaleArray = $pointsSaleArray ;
}
}*/
$newPointSaleArray = $pointsSaleArray ;
$json['points_sale'] = $newPointSaleArray; $json['points_sale'] = $newPointSaleArray;

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

base_url += $('meta[name=slug-producer]').attr('content')+'/' ; base_url += $('meta[name=slug-producer]').attr('content')+'/' ;
} }
return base_url ; return base_url ;
}
}

Loading…
Cancel
Save