Merge branch 'trunk'

This commit is contained in:
Thibault Richy 2019-04-09 09:58:40 +02:00
commit 5e12d1036d

View file

@ -478,9 +478,11 @@ class PanierController extends Controller
if($cp){
$panierContent = PanierContent::where(['panier_content_panierId' => $panier->panier_id, 'panier_content_couponId' => $cp->coupon_id])->first();
if($panierContent){
$quantity += $panierContent->panier_content_quantity;
//$quantity += $panierContent->panier_content_quantity;
$panierContent->panier_content_quantity = $quantity + $panierContent->panier_content_quantity;
// MAJ du contenu
$panierContent->update(['panier_content_quantity', $quantity]);
$panierContent->save();
//$panierContent->update(['panier_content_quantity', $quantity]);
}else{
// Ajout du contenu
if($quantity > 0){