Merge pull request #19 from VitalyArt/master

fix generatedAt
This commit is contained in:
Alex Lushpai 2016-12-29 15:47:33 +03:00 committed by GitHub
commit 10459281f7

View File

@ -55,7 +55,7 @@ class ModelRetailcrmHistory extends Model
return false; return false;
$orders = RetailcrmHistoryHelper::assemblyOrder($packs->history); $orders = RetailcrmHistoryHelper::assemblyOrder($packs->history);
$generatedAt = $orders['generatedAt']; $generatedAt = $packs['generatedAt'];
$this->subtotalSettings = $this->model_setting_setting->getSetting('sub_total'); $this->subtotalSettings = $this->model_setting_setting->getSetting('sub_total');
$this->totalSettings = $this->model_setting_setting->getSetting('total'); $this->totalSettings = $this->model_setting_setting->getSetting('total');