mirror of
https://github.com/kevin-DL/LaravelShoppingcart.git
synced 2026-01-20 06:15:11 +00:00
Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/350
Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/349 Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/478
This commit is contained in:
@@ -575,11 +575,11 @@ class Cart
|
||||
$stored = $this->getConnection()->table($this->getTableName())
|
||||
->where('identifier', $identifier)->first();
|
||||
|
||||
$storedContent = unserialize($stored->content);
|
||||
$storedContent = unserialize(data_get($stored, 'content'));
|
||||
|
||||
$currentInstance = $this->currentInstance();
|
||||
|
||||
$this->instance($stored->instance);
|
||||
$this->instance(data_get($stored, 'instance'));
|
||||
|
||||
$content = $this->getContent();
|
||||
|
||||
@@ -742,7 +742,7 @@ class Cart
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the Formated number
|
||||
* Get the Formatted number
|
||||
*
|
||||
* @param $value
|
||||
* @param $decimals
|
||||
@@ -759,7 +759,7 @@ class Cart
|
||||
$decimalPoint = is_null(config('cart.format.decimal_point')) ? '.' : config('cart.format.decimal_point');
|
||||
}
|
||||
if(is_null($thousandSeperator)){
|
||||
$thousandSeperator = is_null(config('cart.format.thousand_seperator')) ? ',' : config('cart.format.thousand_seperator');
|
||||
$thousandSeperator = is_null(config('cart.format.thousand_separator')) ? ',' : config('cart.format.thousand_separator');
|
||||
}
|
||||
|
||||
return number_format($value, $decimals, $decimalPoint, $thousandSeperator);
|
||||
|
||||
Reference in New Issue
Block a user