fixes on guest user

database/migrations/0000_00_00_000001_factotum_ecommerce_setup.php

@@ -53,6 +53,7 @@ public function up()
 			$table->string('label', 255);
 			$table->text('description')->nullable();
 			$table->string('lang', 5);
+			$table->boolean('show_in_home');
 
 			$table->bigInteger('image')->unsigned()->nullable(true);
 

src/FactotumServiceProvider.php

@@ -38,6 +38,8 @@
 use Kaleidoscope\Factotum\Observers\CategoryObserver;
 use Kaleidoscope\Factotum\Observers\DiscountCodeObserver;
 use Kaleidoscope\Factotum\Observers\OrderObserver;
+use Kaleidoscope\Factotum\Observers\ProductObserver;
+
 
 
 use Kaleidoscope\Factotum\Console\Commands\FactotumCleanFolders;
@@ -191,6 +193,7 @@ public function boot(GateContract $gate)
 
 		if ( env('FACTOTUM_ECOMMERCE_INSTALLED') ) {
 			Order::observe(OrderObserver::class);
+			Product::observe(ProductObserver::class);
 			DiscountCode::observe(DiscountCodeObserver::class);
 		}
 

src/app/Brand.php

@@ -25,6 +25,9 @@ class Brand extends Model
 		'deleted_at'
 	];
 
+	protected $appends = [
+		'total_products'
+	];
 
 	public function products() {
 		return $this->hasMany('Kaleidoscope\Factotum\Product');
@@ -45,4 +48,9 @@ public function getLogoAttribute($value)
 		return null;
 	}
 
+	public function getTotalProductsAttribute()
+	{
+		return Product::where('brand_id', $this->id)->count();
+	}
+
 }

src/app/Helpers/PrintProductCategoriesHelper.php

@@ -30,7 +30,7 @@ private static function print_product_categories_items( $productCategories, $bas
 			$html .= '<li class="category-item category-item-' . $level . '">' . "\n";
 			$html .= '<div class="flexed">' . "\n";
 			$html .= '<a href="' . $baseURL . '/' . $item->name . '"'
-					.' class="' . ( $productCategory && $item->id == $productCategory->id ? 'active' : '' ) . '">' . $item->label . '</a>' . "\n";
+					.' class="' . ( $productCategory && $item->id == $productCategory->id ? 'active' : '' ) . '">' . ucfirst(strtolower($item->label)) . ' (' . $item->total_products . ')</a>' . "\n";
 
 			if ( $showChilds && $item->childs->count() > 0 ) {
 				$html .= '<button class="toggle-subcategory"><i class="fi flaticon-down-arrow"></i></button>';

src/app/Http/Controllers/Api/Campaign/UpdateController.php

@@ -21,15 +21,4 @@ public function update(StoreCampaign $request, $id)
 		return response()->json( [ 'result' => 'ok', 'campaign'  => $campaign ] );
 	}
 
-	public function updateFilter(StoreCampaignFilter $request, $id)
-	{
-		$filter = $request->input('filter');
-
-		$campaign = Campaign::find( $id );
-		$campaign->filter = $filter;
-		$campaign->save();
-
-		return response()->json( [ 'result' => 'ok', 'campaign'  => $campaign ] );
-	}
-
 }

src/app/Http/Controllers/Api/Order/UpdateController.php

@@ -31,8 +31,10 @@ public function changeOrdersStatus(Request $request)
 		if ( $orders && count($orders) > 0 ) {
 			foreach ( $orders as $orderId ) {
 				$order = Order::find($orderId);
-				$order->status = $status;
-				$order->save();
+				if ( $order ) {
+					$order->status = $status;
+					$order->save();
+				}
 			}
 		}
 

src/app/Http/Controllers/Api/Product/ReadController.php

@@ -62,8 +62,14 @@ public function getListPaginated( Request $request )
 				$query->where('active', true );
 			}
 
+			if ( isset($filters['featured']) && $filters['featured'] ) {
+				$query->where('featured', true );
+			}
+
 		}
 
+		$totalCountQuery = clone $query;
+
 		$query->orderBy($sort, $direction);
 
         if ( $limit ) {
@@ -76,7 +82,7 @@ public function getListPaginated( Request $request )
 
 		$products = $query->get();
 
-        return response()->json( [ 'result' => 'ok', 'products' => $products, 'total' => Product::count() ]);
+        return response()->json( [ 'result' => 'ok', 'products' => $products, 'total' => $totalCountQuery->count() ]);
     }
 
 
@@ -92,7 +98,7 @@ public function getListBySearch( Request $request )
 	{
 		$search = $request->input('search');
 
-		$query = Product::where( 'title', 'like', '%' . $search . '%' )
+		$query = Product::where( 'name', 'like', '%' . $search . '%' )
 						->orWhere( 'code', 'like', '%' . $search . '%'  );
 
 		$productList = $query->get();

src/app/Http/Controllers/Web/Ecommerce/Cart/ReadController.php

@@ -52,6 +52,7 @@ public function ajaxGetCartPanel( Request $request )
 
 			$result = [
 				'result'        => 'ok',
+				'cart_id'       => $cart->id,
 				'totalProducts' => $totals['totalProducts'],
 				'totalPartial'  => '€' . number_format( $totals['totalPartial'], 2, ',', '.' ),
 				'totalTaxes'    => '€' . number_format( $totals['totalTaxes'], 2, ',', '.' ),

src/app/Http/Controllers/Web/Ecommerce/Checkout/CheckoutController.php

@@ -56,6 +56,10 @@ public function prepareCheckout( Request $request )
 												->where( 'customer_id', $user->id )
 												->orderBy('default_address', 'DESC')
 												->get();
+		} else {
+			$request->session()->remove('delivery_address');
+			$request->session()->remove('invoice_address');
+			$request->session()->remove('shipping');
 		}
 
 
@@ -296,6 +300,9 @@ public function setGuestDeliveryAddress( StoreGuestCustomerDeliveryAddress $requ
 
 				if ( $deliveryAddress ) {
 					$request->session()->put('delivery_address', $deliveryAddress->id );
+					$request->session()->remove('invoice_address');
+					$request->session()->remove('shipping');
+
 					return $request->wantsJson() ? json_encode([ 'result' => 'ok' ]) : redirect()->back();
 				}
 			}

src/app/Http/Requests/StoreProductCategory.php

@@ -19,6 +19,7 @@ public function rules()
 
 		$productCategoriesViaPim = config('factotum.product_categories_via_pim');
 
+		// TODO: categoria unique ma solo su categorie non "deleted_at"
 		if ( !$productCategoriesViaPim ) {
 
 			$rules = [

src/app/Observers/ProductObserver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Kaleidoscope\Factotum\Observers;
+
+use Illuminate\Support\Facades\DB;
+
+use Kaleidoscope\Factotum\Product;
+use Kaleidoscope\Factotum\CartProduct;
+
+
+class ProductObserver
+{
+
+	public function deleting(Product $product)
+	{
+		CartProduct::where('product_id', $product->id)->delete();
+	}
+
+}

src/app/Order.php

@@ -112,7 +112,7 @@ public function sendOrderStatusChangeNotification()
 			$customer = User::with('profile')->find( $this->customer_id );
 		}
 
-		if ( file_exists(app_path('Notifications/NewOrderToCustomerNotification.php')) ) {
+		if ( file_exists(app_path('Notifications/OrderStatusChangeToCustomerNotification.php')) ) {
 			Notification::send( $customer, new \App\Notifications\OrderStatusChangeToCustomerNotification( $customer, $this ) );
 		} else {
 			Notification::send( $customer, new OrderStatusChangeToCustomerNotification( $customer, $this ) );

src/app/ProductCategory.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Response;
 
 class ProductCategory extends Model
@@ -18,15 +19,17 @@ class ProductCategory extends Model
 		'lang',
 		'image',
 		'description',
-		'order_no'
+		'order_no',
+		'show_in_home'
 	];
 
 	protected $hidden = [
 		'created_at', 'updated_at', 'deleted_at'
 	];
 
 	protected $appends = [
-		'abs_url'
+		'abs_url',
+		'total_products'
 	];
 
 	public function products()
@@ -262,4 +265,20 @@ public function getAbsUrlAttribute( $value )
 		return $value;
 	}
 
+	public function getTotalProductsAttribute()
+	{
+		$tmp = [ $this->id ];
+		$childs = $this->singleCategoryFlatTreeChildsArray( null, null );
+
+		if ( $childs && count($childs) > 0 ) {
+			foreach ( $childs as $c ) {
+				$tmp[] = $c->id;
+			}
+		}
+
+		return DB::table('products')
+					->whereIn('product_category_id', $tmp)
+					->count();
+	}
+
 }

src/app/Traits/CartUtils.php

@@ -242,7 +242,6 @@ protected function _getShippingOptions( $countryCode = null)
 
 			if ( $deliveryAddress ) {
 				$countryCode = strtoupper($deliveryAddress->country);
-
 			}
 
 			if ( $countryCode ) {
@@ -256,6 +255,18 @@ protected function _getShippingOptions( $countryCode = null)
 							'label'  => Lang::get('factotum::ecommerce_checkout.shipping_' . $countryCode . '_' . $shippingType )
 						];
 					}
+
+				} else {
+
+					$shippingTypes = $shippingOptions[ 'other' ];
+
+					foreach ( $shippingTypes as $shippingType => $amount ) {
+						$tmp[ 'other_' . $shippingType ] = [
+							'amount' => $amount,
+							'label'  => Lang::get('factotum::ecommerce_checkout.shipping_other_' . $shippingType )
+						];
+					}
+
 				}
 
 			} else {

src/config/factotum.php

@@ -165,6 +165,6 @@
 	'min_free_shipping' => 65,
 
 
-	'version' => '5.0.10',
+	'version' => '5.0.11',
 
 ];

src/resources/lang/en-GB/ecommerce_checkout.php

@@ -9,8 +9,10 @@
 	'shipping_italy'   => 'Express Delivery in Italy',
 	'shipping_abroad'  => 'Express Delivery abroad',
 
-	'shipping_IT_express'  => 'Italy express',
-	'shipping_IT_standard' => 'Italy standard',
+	'shipping_IT_express'  => 'Italy - Express',
+	'shipping_IT_standard' => 'Italy - Standard',
+
+	'shipping_other_standard' => 'Abroad - Standard',
 
 	'delivery_address_title' => 'delivery address',
 	'invoice_address_title'  => 'invoice address',

src/resources/lang/it-IT/ecommerce_cart.php

@@ -11,5 +11,8 @@
 	'product_dropped'    => 'Prodotto rimosso dal carrello!',
 	'product_drop_error' => 'Impossibile rimuovere un prodotto dal carrello!',
 
-	'max_quantity_reached' => 'Quantità massima raggiunta!'
+	'max_quantity_reached' => 'Quantità massima raggiunta!',
+
+	'free_shipping' => 'Gratuita',
+	'shipping_not_calculated' => '<small>Calcolata alla cassa</small>'
 ];

src/resources/lang/it-IT/ecommerce_checkout.php

@@ -8,4 +8,44 @@
 	'shipping_pick_up' => 'Ritiro presso la nostra sede',
 	'shipping_italy'   => 'Consegna in tutta Italia tramite Corriere Espresso',
 	'shipping_abroad'  => 'Consegna per l\'estero tramite Corriere Espresso',
+
+
+	'shipping_IT_express'  => 'Espressa - Italia',
+	'shipping_IT_standard' => 'Standard - Italia',
+
+	'shipping_other_standard' => 'Standard - Estero',
+
+	'delivery_address_title' => 'Indirizzo di consegna',
+	'invoice_address_title'  => 'Indirizzo di fatturazione',
+	'shipping_title'         => 'Spedizione',
+	'payment_title'          => 'Metodo di Pagamento',
+
+	'first_name'       => 'Nome',
+	'last_name'        => 'Cognome',
+	'email'            => 'Email',
+	'phone'            => 'Telefono',
+	'company_name'     => 'Nome Azienda',
+	'additional_notes' => 'Note aggiuntive',
+
+	'delivery_address'        => 'Indirizzo di consegna',
+	'delivery_address_line_2' => 'Indirizzo di consegna - dati aggiuntivi',
+	'delivery_city'           => 'Città',
+	'delivery_zip'            => 'CAP',
+	'delivery_province'       => 'Provincia',
+	'delivery_country'        => 'Nazione',
+
+	'invoice_address'        => 'Indirizzo di fatturazione',
+	'invoice_address_line_2' => 'Indirizzo di fatturazione - dati aggiuntivi',
+	'invoice_city'           => 'Città',
+	'invoice_zip'            => 'CAP',
+	'invoice_province'       => 'Provincia',
+	'invoice_country'        => 'Nazione',
+
+	'use_same_address_as_invoice_address' => 'Usa lo stesso indirizzo per la fatturazione',
+	'select_delivery_address_first'       => 'Seleziona prima l\'indirizzo di consegna',
+
+	'agree_terms_conditions'           => 'Aderisco ai termini e condizioni',
+	'credit_or_debit_cart'             => 'Carta di debito o credito',
+	'pay_with_credit_or_debit_cart'    => 'Paga con Carta di debito o credito',
+	'custom_payment_in_agreement_with' => 'Pagamento secondo accordi'
 ];

src/resources/lang/it-IT/ecommerce_order.php

@@ -22,4 +22,13 @@
 	'refunded'         => 'Rimborsato',
 	'failed'           => 'Fallito',
 
+
+	'product'        => 'Prodotto',
+	'quantity'       => 'Quantità',
+	'price'          => 'Prezzo',
+	'total_partial'  => 'Subtotale',
+	'total_taxes'    => 'Totale Tasse',
+	'total_shipping' => 'Totale Spedizione',
+	'payment_method' => 'Metodo di pagamento',
+	'total'          => 'Totale'
 ];

src/resources/views/ecommerce/cart/partials/cart-recap.blade.php

@@ -31,7 +31,7 @@
             <td class="tar">
                 <span class="total-shipping">
                     @if( $totalShipping )
-                        {{ '€ ' . number_format( $totalShipping, 2, ',', '.' ) }}
+						{!! $totalShipping !!}
                     @else
                         -
                     @endif