Merge pull request #298 from avored/dev

Dev
avored · Dec 21, 2018 · aff0cbb · aff0cbb
2 parents 20bb509 + fc3bdad
commit aff0cbb
Show file tree

Hide file tree

Showing 25 changed files with 959 additions and 260 deletions.
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -9,6 +9,7 @@
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use AvoRed\Framework\Models\Contracts\ConfigurationInterface;
+use AvoRed\Framework\Models\Contracts\UserInterface;
 use Illuminate\Support\Facades\Session;
 use Laravel\Socialite\Facades\Socialite;
 use Illuminate\Support\Facades\Config;
@@ -37,12 +38,19 @@ class LoginController extends Controller
      */
     protected $redirectTo = '/my-account';
 
+    /**
+     * Where to redirect users after login / registration.
+     *
+     * @var \AvoRed\Framework\Models\Repository\UserRepository
+     */
+    protected $userRepository;
+
     /**
      * Admin User Controller constructor.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(UserInterface $userRepository)
     {
         parent::__construct();
 
@@ -54,6 +62,7 @@ public function __construct()
         if ($url == $checkoutUrl) {
             $this->redirectTo = $checkoutUrl;
         }
+        $this->userRepository = $userRepository;
     }
 
     protected function guard()
@@ -164,10 +173,11 @@ public function providerLogin($provider)
             'redirect' => asset('login/' . $provider . '/callback')
         ]);
 
-        //dd(Config::get('services.github'));
-        //dd($provider);
-
-        return Socialite::driver($provider)->stateless()->redirect();
+        if ('twitter' === $provider) {
+            return Socialite::driver($provider)->redirect();
+        } else {
+            return Socialite::driver($provider)->stateless()->redirect();
+        }
     }
 
     /**
@@ -188,8 +198,42 @@ public function providerCallback($provider)
             'redirect' => asset('login/'. $provider .'/callback')
         ]);
 
-        $user = Socialite::driver($provider)->stateless()->user();
+        if ('twitter' === $provider) {
+            $user = Socialite::driver($provider)->user();
+        } else {
+            $user = Socialite::driver($provider)->stateless()->user();
+        }
+
+        switch ($provider) {
+            case 'twitter':
+                $channel = 'TWITTER';
+                break;
+            case 'facebook':
+                $channel = 'FACEBOOK';
+                break;
+            case 'google':
+                $channel = 'GOOGLE';
+        }
+
+
+        if (empty($user->email)) {
+            throw new \Exception(
+                'Please check ' . $provider . ' permisssion or asked user to allow them to give access to their email'
+            );
+        }
+        $modelUser = $this->userRepository->findByEmail($user->email);
+        if (null === $modelUser) {
+            $data = [
+                'first_name' => $user->name,
+                'last_name' => '',
+                'email' => $user->email,
+                'password' => bcrypt(str_random(8)),
+                'registered_channel' => $channel
+            ];
+            $modelUser = $this->userRepository->create($data);
+        }
+        Auth::loginUsingId($modelUser->id);
 
-        dd($user);
+        return redirect($this->redirectTo);
     }
 }
diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php
@@ -39,11 +39,8 @@ public function __construct(ProductInterface $repository, ConfigurationInterface
     public function addToCart(Request $request)
     {
         $slug = $request->get('slug');
-
         $qty = abs($request->get('qty', 1));
-
         $attribute = $request->get('attribute', null);
-
         if (!Cart::canAddToCart($slug, $qty, $attribute)) {
             return redirect()->back()
                 ->with(
@@ -61,7 +58,6 @@ public function addToCart(Request $request)
     public function view()
     {
         $cartProducts = Cart::all();
-
         return view('cart.view')
             ->with('cartProducts', $cartProducts);
     }
@@ -70,14 +66,16 @@ public function update(Request $request)
     {
         $slug = $request->get('slug');
         $qty = abs($request->get('qty', 1));
-        if (!Cart::canAddToCart($slug, $qty)) {
-            return redirect()->back()->with('errorNotificationText', 'Not Enough Qty Available. Please with less qty or Contact site Administrator!');
+        if (!Cart::canAddToCart($slug, $qty, $request->all())) {
+            return redirect()->back()
+                ->with(
+                    'errorNotificationText',
+                    'Not Enough Qty Available. Please with less qty or Contact site Administrator!'
+                );
         }
 
         Cart::update($slug, $qty);
-
         $this->setTaxAmount($slug, $qty);
-
         return redirect()->back();
     }
 

diff --git a/app/Http/Controllers/ProductViewController.php b/app/Http/Controllers/ProductViewController.php
@@ -5,6 +5,9 @@
 use AvoRed\Framework\Models\Contracts\ProductInterface;
 use Illuminate\Http\Request;
 use AvoRed\Framework\Models\Contracts\ProductDownloadableUrlInterface;
+use AvoRed\Framework\Models\Database\Product;
+use Illuminate\Support\Collection;
+use AvoRed\Framework\Models\Database\ProductAttributeIntegerValue;
 
 class ProductViewController extends Controller
 {
@@ -23,7 +26,7 @@ class ProductViewController extends Controller
     public function __construct(
         ProductInterface $repository,
         ProductDownloadableUrlInterface $downRep
-        ) {
+    ) {
         parent::__construct();
 
         $this->repository = $repository;
@@ -33,13 +36,20 @@ public function __construct(
     public function view($slug)
     {
         $product = $this->repository->findBySlug($slug);
+        $jsonData = [];
+
+        if ($product->hasVariation()) {
+            $jsonData = $product->getProductVariationJsonData();
+        }
+
         $title = $product->meta_title ?? $product->name;
         $description = $product->meta_description ?? substr($product->description, 0, 255);
 
         return view('product.view')
-                                ->with('product', $product)
-                                ->with('title', $title)
-                                ->with('description', $description);
+            ->withProduct($product)
+            ->withTitle($title)
+            ->withDescription($description)
+            ->withJsonData($jsonData);
     }
 
     public function downloadDemoProduct(Request $request)

diff --git a/app/Http/Requests/PlaceOrderRequest.php b/app/Http/Requests/PlaceOrderRequest.php
@@ -38,7 +38,7 @@ public function rules()
             $validation['billing.address1'] = 'required|max:255';
             $validation['billing.address2'] = 'max:255';
             $validation['billing.country_id'] = 'required|max:255';
-            $validation['billing.state'] = 'required|max:255';
+            $validation['billing.state'] = 'max:255';
             $validation['billing.city'] = 'required|max:255';
             $validation['billing.postcode'] = 'required|max:255';
         }
@@ -47,7 +47,7 @@ public function rules()
             $validation['shipping.address1'] = 'required|max:255';
             $validation['shipping.address2'] = 'max:255';
             $validation['shipping.country_id'] = 'required|max:255';
-            $validation['shipping.state'] = 'required|max:255';
+            $validation['shipping.state'] = 'max:255';
             $validation['shipping.city'] = 'required|max:255';
             $validation['shipping.postcode'] = 'required|max:255';
         }

diff --git a/modules/avored/pickup/resources/lang/en/pickup.php b/modules/avored/pickup/resources/lang/en/pickup.php
@@ -0,0 +1,8 @@
+<?php 
+
+return [
+
+
+    'title' => 'Pay at Pickup'
+
+];
diff --git a/modules/avored/pickup/src/Module.php b/modules/avored/pickup/src/Module.php
@@ -22,16 +22,6 @@ public function boot()
         $this->registerAdminConfiguration();
     }
 
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-
-    }
-
     /**
      * Registering AvoRed featured Resource
      * e.g. Route, View, Database  & Translation Path
@@ -41,6 +31,7 @@ public function register()
     protected function registerResources()
     {
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'avored-pickup');
+        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'avored-pickup');
     }
 
     /**
@@ -58,10 +49,12 @@ protected function registerAdminConfiguration()
                 ->label('Payment Pickup Enabled')
                 ->type('select')
                 ->name('payment_pickup_enabled')
-                ->options(function (){
-                    $options = [1 => 'Yes' , 0 => 'No'];
-                    return $options;
-                });
+                ->options(
+                    function () {
+                        $options = [1 => 'Yes' , 0 => 'No'];
+                        return $options;
+                    }
+                );
     }
 
     /**
@@ -74,5 +67,4 @@ protected function registerPaymentOption()
         $payment = new Pickup();
         PaymentFacade::put($payment->identifier(), $payment);
     }
-
 }
diff --git a/modules/avored/pickup/src/Payment/Pickup.php b/modules/avored/pickup/src/Payment/Pickup.php
@@ -23,7 +23,7 @@ class Pickup extends AbstractPayment implements PaymentContract
      *
      * @var string
      */
-    protected $name = 'Pickup From Store';
+    protected $name;
 
     /**
      * Payment options View Path.
@@ -59,6 +59,7 @@ public function enable()
      */
     public function name()
     {
+        $this->name = __('avored-pickup::pickup.title');
         return $this->name;
     }