From 6216e084ea4aafefb289af863a073dde5d6a4741 Mon Sep 17 00:00:00 2001 From: Roberto Guido Date: Sat, 2 Dec 2023 18:44:56 +0100 Subject: [PATCH 1/4] fix duplicazione contenuti in documento dettaglio consegne personale --- .../personal_aggregate_shipping.blade.php | 85 ------------------- 1 file changed, 85 deletions(-) diff --git a/code/resources/views/documents/personal_aggregate_shipping.blade.php b/code/resources/views/documents/personal_aggregate_shipping.blade.php index 6484fb91..2e1bd3cd 100644 --- a/code/resources/views/documents/personal_aggregate_shipping.blade.php +++ b/code/resources/views/documents/personal_aggregate_shipping.blade.php @@ -109,90 +109,5 @@

 

@endforeach - - @if($valid_bookings > 1) - @foreach($bookings as $super_booking) - @if($super_booking->user->isFriend()) - @continue - @endif - - - - - - - - - - - - @foreach($super_booking->bookings as $booking) - products_with_friends_always_aggregated ?> - @if($products->isEmpty() == false) - getValue('booked', true); - $delivered_cell_value += $booking->getValue('delivered', true); - - ?> - - - - - - - - - - - - - - @foreach($products as $product) - @if($product->variants->isEmpty() == false) - @foreach($product->variants as $variant) - @if(!empty($variant->quantity) || !empty($variant->delivered)) - - - - - - - - @endif - @endforeach - @else - @if(!empty($product->quantity) || !empty($product->delivered)) - - - - - - - - @endif - @endif - @endforeach - @endif - @endforeach - - @foreach($booking->aggregatedModifiers() as $am) - - - - @endforeach - - - - - - - - -
- {{ _i('Totale') }} -
{{ $booking->order->supplier->printableName() }}
{{ _i('Prodotto') }}{{ _i('Prenotato') }} {{ _i('Consegnato') }} 
{{ $product->product->printableName() }}{{ printableQuantity($variant->quantity, $product->product->measure->discrete, 2, ',') }} {{ $variant->printableName() }}{{ printablePriceCurrency($variant->quantityValue(), ',') }}{{ printableQuantity($variant->delivered, $product->product->measure->discrete, 2, ',') }} {{ $variant->printableName() }}{{ printablePriceCurrency($variant->deliveredValue(), ',') }}
{{ $product->product->printableName() }}{{ printableQuantity($product->quantity, $product->product->measure->discrete, 2, ',') }}{{ printablePriceCurrency($product->getValue('booked'), ',') }}{{ printableQuantity($product->delivered, $product->product->measure->discrete, 2, ',') }}{{ printablePriceCurrency($product->getValue('delivered'), ',') }}
{{ $am->name }}: {{ printablePriceCurrency($am->amount, ',') }}
{{ _i('Totale Prenotato') }}: {{ printablePriceCurrency($booked_cell_value, ',') }}
{{ _i('Totale Consegnato') }}: {{ printablePriceCurrency($delivered_cell_value, ',') }}
- @endforeach - @endif From eaee08b192c8ffa1c3da7bb988b5fe97e031d33a Mon Sep 17 00:00:00 2001 From: Roberto Guido Date: Sat, 2 Dec 2023 18:51:33 +0100 Subject: [PATCH 2/4] fix interazione tabella modifica rapida prodotti su mobile --- .../views/supplier/products_grid.blade.php | 192 +++++++++--------- 1 file changed, 97 insertions(+), 95 deletions(-) diff --git a/code/resources/views/supplier/products_grid.blade.php b/code/resources/views/supplier/products_grid.blade.php index 4b66f81c..9fa8d318 100644 --- a/code/resources/views/supplier/products_grid.blade.php +++ b/code/resources/views/supplier/products_grid.blade.php @@ -46,103 +46,105 @@
- - - - @foreach($display_columns as $identifier => $metadata) -
- @if($identifier == 'selection') - - @else - {{ $metadata->label }} - @endif +
+ + + + @foreach($display_columns as $identifier => $metadata) + + @endforeach + + + + + + + + + + + + + + + + + + + + + + + @foreach($products as $index => $product) + + + + + + + + + + + + + + + + + + + @endforeach - - - - - - - - - - - - - - - - - - - - - - - @foreach($products as $index => $product) - - - - - - - - - - - - - - - - - - - - @endforeach - -
+ @if($identifier == 'selection') + + @else + {{ $metadata->label }} + @endif +
+ + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - -
+ +
+
From 2049984d42a1033037873a68b34e5a131638de2f Mon Sep 17 00:00:00 2001 From: Roberto Guido Date: Sun, 3 Dec 2023 11:02:51 +0100 Subject: [PATCH 3/4] fix in accesso file di configurazione --- code/app/Helpers/Setup.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/app/Helpers/Setup.php b/code/app/Helpers/Setup.php index fc2f2663..9377b3d6 100644 --- a/code/app/Helpers/Setup.php +++ b/code/app/Helpers/Setup.php @@ -38,9 +38,14 @@ function read_instance_config_file($path) foreach($config as $c) { $c = trim($c); - if (!empty($c)) { - list($name, $value) = explode('=', $c); - $params[$name] = $value; + if (empty($c) == false) { + if (strpos($c, '=') === false) { + \Log::error('Configurazione ambigua in file ' . $path . ' - ' . $c); + } + else { + list($name, $value) = explode('=', $c); + $params[$name] = $value; + } } } From 6c29d1511bfb8eff350511b83b2ebd532a85c532 Mon Sep 17 00:00:00 2001 From: Roberto Guido Date: Mon, 4 Dec 2023 01:29:23 +0100 Subject: [PATCH 4/4] piccolo fix in formattazione tabella complessiva prodotti. ref #240 --- code/app/Printers/Order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/app/Printers/Order.php b/code/app/Printers/Order.php index 91cdfb57..a9c8998f 100644 --- a/code/app/Printers/Order.php +++ b/code/app/Printers/Order.php @@ -209,7 +209,7 @@ private function formatTableRows($order, $shipping_place, $status, $fields, &$al foreach($bookings as $booking) { $row = UserFormatter::format($booking->user, $fields->user_columns); $subrow = $this->formatBookingInTable($order, $booking, $status, $all_products); - $row = array_merge($row, $subrow); + $row += $subrow; $price = $booking->getValue($get_total, true); $total_price += $price;