diff --git a/resources/views/fo/pages/products/show-details.blade.php b/resources/views/fo/pages/products/show-details.blade.php index c48bd991..cacbda88 100644 --- a/resources/views/fo/pages/products/show-details.blade.php +++ b/resources/views/fo/pages/products/show-details.blade.php @@ -1,100 +1,98 @@ -@if (!empty($productWithPricing->product->inco->nv_kj)) -
| {{ __('Nutrient') }} | -{{ __('Per') }} {{ $productWithPricing->product->inco->nv_ref_weight_g }}g - | -
|---|---|
| {{ __('Energy') }} | -
- {{ $productWithPricing->product->inco->nv_kj }} {{ __('Kj') }} - {{ $productWithPricing->product->inco->nv_kcal }} {{ __('Kcal') }} - |
-
|
- {{ __('Fat') }} - • {{ __('Of which saturated fatty acids') }} - |
-
- {{ $productWithPricing->product->inco->nv_fat_g }} g - {{ $productWithPricing->product->inco->nv_sat_fat_g }} g - |
-
|
- {{ __('Carbohydrates') }} - • {{ __('of which sugars') }} - |
-
- {{ $productWithPricing->product->inco->nv_carb_g }} g - {{ $productWithPricing->product->inco->nv_sugar_g }} g - |
-
| {{ __('Dietary fiber') }} | -{{ $productWithPricing->product->inco->nv_fiber_g }} g | -
| {{ __('Proteins') }} | -{{ $productWithPricing->product->inco->nv_protein_g }} g | -
| {{ __('Salt') }} | -{{ $productWithPricing->product->inco->nv_salt_g }} g | -
- *{{ __('Reference Daily Intakes for an adult (8400kj/2000kcal).') }} -
-| {{ __('Nutrient') }} | +{{ __('Per') }} {{ $productWithPricing->product->inco->nv_ref_weight_g }}g + | +
|---|---|
| {{ __('Energy') }} | +
+ {{ $productWithPricing->product->inco->nv_kj }} {{ __('Kj') }} + {{ $productWithPricing->product->inco->nv_kcal }} {{ __('Kcal') }} + |
+
|
+ {{ __('Fat') }} + • {{ __('Of which saturated fatty acids') }} + |
+
+ {{ $productWithPricing->product->inco->nv_fat_g }} g + {{ $productWithPricing->product->inco->nv_sat_fat_g }} g + |
+
|
+ {{ __('Carbohydrates') }} + • {{ __('of which sugars') }} + |
+
+ {{ $productWithPricing->product->inco->nv_carb_g }} g + {{ $productWithPricing->product->inco->nv_sugar_g }} g + |
+
| {{ __('Dietary fiber') }} | +{{ $productWithPricing->product->inco->nv_fiber_g }} g | +
| {{ __('Proteins') }} | +{{ $productWithPricing->product->inco->nv_protein_g }} g | +
| {{ __('Salt') }} | +{{ $productWithPricing->product->inco->nv_salt_g }} g | +
+ *{{ __('Reference Daily Intakes for an adult (8400kj/2000kcal).') }} +
- @if ($productWithPricing->product->weight_variable) - {{ __('About') }}* - @endif -
-- - {{ __('Current price') }} : - @include('fo.modules.guarded-currency', [ - 'money' => $productWithPricing->pricing->hasDiscount ? - $productWithPricing->pricing->discountedPriceTtc() : $productWithPricing->pricing->basePriceTtc(), - 'product' => $productWithPricing->product, - ]) - - - @if ($productWithPricing->product->validDiscount?->is_old_price_displayed) - - {{ __('Original price') }} : - @include('fo.modules.guarded-currency', [ - 'money' => $productWithPricing->pricing->basePriceTtc(), - 'product' => $productWithPricing->product, - ]) - - @endif - /{{ $productWithPricing->product->sell_unit->label() }} -
- -- {{ $productWithPricing->product->weight_variable ? __('Product sold by the kilo') : __('Price per kilo') }} : - @include('fo.modules.guarded-currency', [ - 'money' => $productWithPricing->pricing->priceKgTtc(), - 'product' => $productWithPricing->product - ]) - /kg -
-+ @if ($productWithPricing->product->weight_variable) + {{ __('About') }}* + @endif +
++ + {{ __('Current price') }} : + @include('fo.modules.guarded-currency', [ + 'money' => $productWithPricing->pricing->hasDiscount + ? $productWithPricing->pricing->discountedPriceTtc() + : $productWithPricing->pricing->basePriceTtc(), + 'product' => $productWithPricing->product, + ]) + + + @if ($productWithPricing->product->validDiscount?->is_old_price_displayed) + + {{ __('Original price') }} : + @include('fo.modules.guarded-currency', [ + 'money' => $productWithPricing->pricing->basePriceTtc(), + 'product' => $productWithPricing->product, + ]) + + @endif + /{{ $productWithPricing->product->sell_unit->label() }} +
+ ++ {{ $productWithPricing->product->weight_variable ? __('Product sold by the kilo') : __('Price per kilo') }} : + @include('fo.modules.guarded-currency', [ + 'money' => $productWithPricing->pricing->priceKgTtc(), + 'product' => $productWithPricing->product, + ]) + /kg +
+