Solucionado bug al cambiar la columna predeterminada subtotal/neto.

NeoRazorX · Oct 6, 2022 · 5bf1289 · 5bf1289
1 parent 14b328d
commit 5bf1289
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/Core/Base/AjaxForms/CommonLineHTML.php b/Core/Base/AjaxForms/CommonLineHTML.php
@@ -32,7 +32,7 @@
 trait CommonLineHTML
 {
     /** @var string */
-    protected static $columnView = 'subtotal';
+    protected static $columnView;
 
     /** @var int */
     protected static $num = 0;

diff --git a/Core/Base/AjaxForms/CommonSalesPurchases.php b/Core/Base/AjaxForms/CommonSalesPurchases.php
@@ -31,7 +31,7 @@
 
 trait CommonSalesPurchases
 {
-    protected static $columnView = 'subtotal';
+    protected static $columnView;
 
     protected static function cifnif(Translator $i18n, BusinessDocument $model): string
     {
@@ -522,8 +522,7 @@ protected static function subtotalNetoBtn(Translator $i18n): string
                 . $i18n->trans('subtotal') . '</button>';
         }
 
-        $html .= '</div>'
-            . '</div>';
+        $html .= '</div></div>';
         return $html;
     }
 

diff --git a/Core/Base/AjaxForms/PurchasesFooterHTML.php b/Core/Base/AjaxForms/PurchasesFooterHTML.php
@@ -20,10 +20,10 @@
 namespace FacturaScripts\Core\Base\AjaxForms;
 
 use FacturaScripts\Core\App\AppSettings;
+use FacturaScripts\Core\Base\Contract\PurchasesModInterface;
 use FacturaScripts\Core\Base\Translator;
 use FacturaScripts\Core\Model\Base\PurchaseDocument;
 use FacturaScripts\Core\Model\User;
-use FacturaScripts\Core\Base\Contract\PurchasesModInterface;
 
 /**
  * Description of PurchasesFooterHTML
@@ -72,6 +72,10 @@ public static function assets()
 
     public static function render(PurchaseDocument $model): string
     {
+        if (empty(self::$columnView)) {
+            self::$columnView = AppSettings::get('default', 'columnetosubtotal', 'subtotal');
+        }
+
         if (empty($model->codproveedor)) {
             return '';
         }

diff --git a/Core/Base/AjaxForms/PurchasesLineHTML.php b/Core/Base/AjaxForms/PurchasesLineHTML.php
@@ -154,6 +154,10 @@ public static function map(array $lines, PurchaseDocument $model): array
      */
     public static function render(array $lines, PurchaseDocument $model): string
     {
+        if (empty(self::$columnView)) {
+            self::$columnView = AppSettings::get('default', 'columnetosubtotal', 'subtotal');
+        }
+
         self::$numlines = count($lines);
         $i18n = new Translator();
         $html = '';

diff --git a/Core/Base/AjaxForms/SalesFooterHTML.php b/Core/Base/AjaxForms/SalesFooterHTML.php
@@ -71,6 +71,10 @@ public static function assets()
 
     public static function render(SalesDocument $model): string
     {
+        if (empty(self::$columnView)) {
+            self::$columnView = AppSettings::get('default', 'columnetosubtotal', 'subtotal');
+        }
+
         if (empty($model->codcliente)) {
             return '';
         }

diff --git a/Core/Base/AjaxForms/SalesLineHTML.php b/Core/Base/AjaxForms/SalesLineHTML.php
@@ -155,6 +155,10 @@ public static function map(array $lines, SalesDocument $model): array
      */
     public static function render(array $lines, SalesDocument $model): string
     {
+        if (empty(self::$columnView)) {
+            self::$columnView = AppSettings::get('default', 'columnetosubtotal', 'subtotal');
+        }
+
         self::$numlines = count($lines);
         $i18n = new Translator();
         $html = '';