Merge pull request #22 from bagisto/master

Haendlerbund · Jun 30, 2020 · 8beb450 · 8beb450
2 parents b31bc66 + c6cc431
commit 8beb450
Show file tree

Hide file tree

Showing 101 changed files with 1,641 additions and 412 deletions.
diff --git a/.env.example b/.env.example
@@ -47,3 +47,23 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+FACEBOOK_CLIENT_ID=
+FACEBOOK_CLIENT_SECRET=
+FACEBOOK_CALLBACK_URL=https://yourhost.com/customer/social-login/facebook/callback
+
+TWITTER_CLIENT_ID=
+TWITTER_CLIENT_SECRET=
+TWITTER_CALLBACK_URL=https://yourhost.com/customer/social-login/twitter/callback
+
+GOGGLE_CLIENT_ID=
+GOGGLE_CLIENT_SECRET=
+GOGGLE_CALLBACK_URL=https://yourhost.com/customer/social-login/google/callback
+
+LINKEDIN_CLIENT_ID=
+LINKEDIN_CLIENT_SECRET=
+LINKEDIN_CALLBACK_URL=https://yourhost.com/customer/social-login/linkedin/callback
+
+GITHUB_CLIENT_ID=
+GITHUB_CLIENT_SECRET=
+GITHUB_CALLBACK_URL=https://yourhost.com/customer/social-login/github/callback
diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
         "kalnoy/nestedset": "5.0.1",
         "konekt/concord": "^1.2",
         "laravel/framework": "^7.0",
+        "laravel/socialite": "^4.4",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.0",
         "maatwebsite/excel": "3.1.19",
@@ -103,7 +104,8 @@
         "Webkul\\Rule\\": "packages/Webkul/Rule/src",
         "Webkul\\CMS\\": "packages/Webkul/CMS/src",
         "Webkul\\Velocity\\": "packages/Webkul/Velocity/src",
-        "Webkul\\BookingProduct\\": "packages/Webkul/BookingProduct/src"
+        "Webkul\\BookingProduct\\": "packages/Webkul/BookingProduct/src",
+        "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src"
       }
     },
 

diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
@@ -268,6 +268,7 @@
         Webkul\CMS\Providers\CMSServiceProvider::class,
         Webkul\Velocity\Providers\VelocityServiceProvider::class,
         Webkul\BookingProduct\Providers\BookingProductServiceProvider::class,
+        Webkul\SocialLogin\Providers\SocialLoginServiceProvider::class,
     ],
 
     /*

diff --git a/config/concord.php b/config/concord.php
@@ -24,5 +24,6 @@
         \Webkul\CartRule\Providers\ModuleServiceProvider::class,
         \Webkul\CMS\Providers\ModuleServiceProvider::class,
         \Webkul\Velocity\Providers\ModuleServiceProvider::class,
+        \Webkul\SocialLogin\Providers\ModuleServiceProvider::class,
     ]
 ];
diff --git a/config/services.php b/config/services.php
@@ -46,5 +46,35 @@
         'model' => App\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
-    ]
+    ],
+
+    'facebook' => [
+        'client_id' => env('FACEBOOK_CLIENT_ID'),
+        'client_secret' => env('FACEBOOK_CLIENT_SECRET'),
+        'redirect' => env('FACEBOOK_CALLBACK_URL'),
+    ],
+
+    'twitter' => [
+        'client_id' => env('TWITTER_CLIENT_ID'),
+        'client_secret' => env('TWITTER_CLIENT_SECRET'),
+        'redirect' => env('TWITTER_CALLBACK_URL'),
+    ],
+
+    'google' => [
+        'client_id' => env('GOOGLE_CLIENT_ID'),
+        'client_secret' => env('GOOGLE_CLIENT_SECRET'),
+        'redirect' => env('GOOGLE_CALLBACK_URL'),
+    ],
+
+    'linkedin' => [
+        'client_id' => env('LINKEDIN_CLIENT_ID'),
+        'client_secret' => env('LINKEDIN_CLIENT_SECRET'),
+        'redirect' => env('LINKEDIN_CALLBACK_URL'),
+    ],
+
+    'github' => [
+        'client_id' => env('GITHUB_CLIENT_ID'),
+        'client_secret' => env('GITHUB_CLIENT_SECRET'),
+        'redirect' => env('GITHUB_CALLBACK_URL'),
+    ],
 ];
diff --git a/packages/Webkul/API/Http/Resources/Sales/Order.php b/packages/Webkul/API/Http/Resources/Sales/Order.php
@@ -100,10 +100,11 @@ public function toArray($request)
             'channel'                            => $this->when($this->channel_id, new ChannelResource($this->channel)),
             'shipping_address'                   => new OrderAddress($this->shipping_address),
             'billing_address'                    => new OrderAddress($this->billing_address),
-            'updated_at'                         => $this->updated_at,
             'items'                              => OrderItem::collection($this->items),
             'invoices'                           => Invoice::collection($this->invoices),
             'shipments'                          => Shipment::collection($this->shipments),
+            'downloadable_links'                 => $this->downloadable_link_purchased,
+            'updated_at'                         => $this->updated_at,
             'created_at'                         => $this->created_at,
         ];
     }