Merge pull request #183 from avored/dev

mergin dev to master

app/Events/OrderPlaceAfterEvent.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Queue\SerializesModels;
+use AvoRed\Framework\Models\Database\Order;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+class OrderPlaceAfterEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /***
+     * AvoRed Order Model
+     *
+     * @var \AvoRed\Framework\Models\Database\Order
+     *
+     */
+    public $order;
+
+    public $orderProducts;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param \AvoRed\Framework\Models\Database\Order $order
+     * @param array $orderProducts
+     * @param \Illuminate\Http\Request $request
+     */
+    public function __construct(Order $order, $orderProducts, $request)
+    {
+        $this->order = $order;
+        $this->orderProducts = $orderProducts;
+        $this->request = $request;
+    }
+}

app/Events/UserRegisteredEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Queue\SerializesModels;
+use AvoRed\Framework\Models\Database\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+
+class UserRegisteredEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $user = null;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use AvoRed\Ecommerce\Models\Database\User;
+use AvoRed\Framework\Models\Database\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\URL;

app/Http/Controllers/Auth/RegisterController.php

@@ -3,14 +3,14 @@
 namespace App\Http\Controllers\Auth;
 
 use AvoRed\Framework\Models\Database\Configuration;
-use AvoRed\Ecommerce\Models\Database\User;
+use AvoRed\Framework\Models\Database\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
-use AvoRed\Ecommerce\Events\UserRegisteredEvent;
-use AvoRed\Ecommerce\Mail\NewUserMail;
+use App\Events\UserRegisteredEvent;
+use App\Mail\NewUserMail;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use App\Http\Controllers\Controller;

app/Http/Controllers/Auth/UserActivationController.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Auth;
 
 use Illuminate\Http\Request;
-use AvoRed\Ecommerce\Models\Database\User;
+use AvoRed\Framework\Models\Database\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
-use AvoRed\Ecommerce\Mail\NewUserMail;
+use App\Mail\NewUserMail;
 use App\Http\Controllers\Controller;
 
 class UserActivationController extends Controller

app/Http/Controllers/CheckoutController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use AvoRed\Ecommerce\Models\Database\Country;
+use AvoRed\Framework\Models\Database\Country;
 use AvoRed\Framework\Payment\Facade as Payment;
 use AvoRed\Framework\Shipping\Facade as Shipping;
 use AvoRed\Framework\Cart\Facade as Cart;

app/Http/Controllers/HomeController.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
-use AvoRed\Ecommerce\Models\Database\Page;
+use AvoRed\Framework\Models\Database\Page;
 use AvoRed\Framework\Models\Database\Configuration;
 
 class HomeController extends Controller

app/Http/Controllers/OrderController.php

@@ -6,14 +6,14 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
-use AvoRed\Ecommerce\Events\OrderPlaceAfterEvent;
+use App\Events\OrderPlaceAfterEvent;
 use App\Http\Requests\PlaceOrderRequest;
 use AvoRed\Framework\Payment\Facade as Payment;
 use AvoRed\Framework\Cart\Facade as Cart;
 use AvoRed\Framework\Models\Database\OrderStatus;
 use AvoRed\Framework\Models\Database\Order;
-use AvoRed\Ecommerce\Models\Database\User;
-use AvoRed\Ecommerce\Models\Database\Address;
+use AvoRed\Framework\Models\Database\User;
+use AvoRed\Framework\Models\Database\Address;
 use AvoRed\Framework\Models\Database\OrderProductVariation;
 use Illuminate\Support\Facades\Session;
 use AvoRed\Framework\Models\Contracts\ConfigurationInterface;

app/Http/Controllers/PageController.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
-use AvoRed\Ecommerce\Models\Database\Page;
+use AvoRed\Framework\Models\Database\Page;
 
 class PageController extends Controller
 {

app/Http/Controllers/User/AddressController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\User;
 
-use AvoRed\Ecommerce\Models\Database\Country;
+use AvoRed\Framework\Models\Database\Country;
 use AvoRed\Framework\Models\Database\Configuration;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Requests\AddressRequest;
-use AvoRed\Ecommerce\Models\Database\Address;
+use AvoRed\Framework\Models\Database\Address;
 use App\Http\Controllers\Controller;
 
 class AddressController extends Controller
@@ -61,7 +61,7 @@ public function store(AddressRequest $request)
     /**
      * Show the form for editing the specified user addresses.
      *
-     * @param \AvoRed\Ecommerce\Models\Database\Address $address
+     * @param \AvoRed\Framework\Models\Database\Address $address
      * @return \Illuminate\Http\Response
      */
     public function edit(Address  $address)
@@ -81,7 +81,7 @@ public function edit(Address  $address)
      * Update the specified user addresses in database.
      *
      * @param \App\Http\Requests\AddressRequest $request
-     * @param \AvoRed\Ecommerce\Models\Database\Address $address
+     * @param \AvoRed\Framework\Models\Database\Address $address
      * @return \Illuminate\Http\Response
      */
     public function update(AddressRequest $request, Address $address)

app/Http/Controllers/User/MyAccountController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\User;
 
-use AvoRed\Ecommerce\Http\Requests\ChangePasswordRequest;
+use App\Http\Requests\ChangePasswordRequest;
 use App\Http\Requests\UploadUserImageRequest;
 use App\Http\Requests\UserProfileRequest;
 use Illuminate\Support\Facades\Auth;

app/Http/Controllers/User/WishlistController.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\Auth;
 use AvoRed\Framework\Models\Database\Product;
-use AvoRed\Ecommerce\Models\Database\Wishlist;
+use AvoRed\Framework\Models\Database\Wishlist;
 use App\Http\Controllers\Controller;
 
 class WishlistController extends Controller

app/Http/Requests/ChangePasswordRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Foundation\Http\FormRequest;
+class ChangePasswordRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $validation['password'] = 'required|min:6|confirmed';
+        $validation['current_password'] = 'required';
+        $user = Auth::user();
+        return $validation;
+    }
+}

app/Http/ViewComposers/CheckoutComposer.php

@@ -5,7 +5,7 @@
 use Illuminate\View\View;
 use Illuminate\Support\Facades\Auth;
 use AvoRed\Framework\Models\Database\Configuration;
-use AvoRed\Ecommerce\Models\Database\Page;
+use AvoRed\Framework\Models\Database\Page;
 use Illuminate\Support\Facades\Session;
 
 class CheckoutComposer

app/Http/ViewComposers/LayoutAppComposer.php

@@ -5,20 +5,20 @@
 use AvoRed\Framework\Models\Database\Configuration;
 use Illuminate\View\View;
 use Illuminate\Support\Facades\Session;
-use AvoRed\Ecommerce\Models\Contracts\MenuInterface;
-use AvoRed\Ecommerce\Models\Contracts\SiteCurrencyInterface;
+use AvoRed\Framework\Models\Contracts\MenuInterface;
+use AvoRed\Framework\Models\Contracts\SiteCurrencyInterface;
 
 class LayoutAppComposer
 {
     /**
      *
-     * @var \AvoRed\Ecommerce\Models\Repository\MenuRepository
+     * @var \AvoRed\Framework\Models\Repository\MenuRepository
      */
     protected $repository;
 
     /**
      *
-     * @var \AvoRed\Ecommerce\Models\Repository\SiteCurrencyRepository
+     * @var \AvoRed\Framework\Models\Repository\SiteCurrencyRepository
      */
     protected $siteCurrencyRepository;
 

app/Mail/NewUserMail.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use AvoRed\Framework\Models\Database\User;
+
+class NewUserMail extends Mailable
+{
+    use Queueable, SerializesModels;
+    /**
+     * @var \AvoRed\Framework\Models\Database\User
+     */
+    public $user;
+
+    /**
+     * Create a new message instance.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->view('mail.new-user')
+            ->with('user', $this->user);
+    }
+}

avored.admin.webpack.mix.js

@@ -15,5 +15,5 @@ mix.config.fileLoaderDirs.fonts     = 'vendor/avored-admin/fonts';
 mix.config.fileLoaderDirs.images    = 'vendor/avored-admin/images';
 
 
-mix.js('modules/avored/ecommerce/resources/assets/js/app.js', 'public/vendor/avored-admin/js');
-mix.sass('modules/avored/ecommerce/resources/assets/sass/app.scss',  'public/vendor/avored-admin/css');
+//mix.js('modules/avored/ecommerce/resources/assets/js/app.js', 'public/vendor/avored-admin/js');
+//mix.sass('modules/avored/ecommerce/resources/assets/sass/app.scss',  'public/vendor/avored-admin/css');

config/app.php

@@ -45,7 +45,7 @@
       | your application so that it is used when running Artisan tasks.
       |
      */
-    'url' => env('APP_URL', 'http://localhost/avored-ecommerce/public'),
+    'url' => env('APP_URL', 'http://localhost:8000'),
     /*
       |--------------------------------------------------------------------------
       | Application Timezone
@@ -145,7 +145,7 @@
         Illuminate\View\ViewServiceProvider::class,
 
         AvoRed\Framework\Provider::class,
-        AvoRed\Ecommerce\Provider::class,
+        //AvoRed\Ecommerce\Provider::class,
 
         /*
          * Package Service Providers...

config/auth.php

@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => AvoRed\Ecommerce\Models\Database\User::class,
+            'model' => AvoRed\Framework\Models\Database\User::class,
         ],
     ],
 

config/services.php

@@ -30,7 +30,7 @@
     ],
 
     'stripe' => [
-        'model' => AvoRed\Ecommerce\Models\Database\User::class,
+        'model' => AvoRed\Framework\Models\Database\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
     ],

database/factories/UserFactory.php

@@ -13,7 +13,7 @@
 |
 */
 
-$factory->define(AvoRed\Ecommerce\Models\Database\User::class, function (Faker $faker) {
+$factory->define(AvoRed\Framework\Models\Database\User::class, function (Faker $faker) {
     static $password;
 
     return [

phpunit.xml

@@ -19,7 +19,7 @@
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./modules/avored/ecommerce/src</directory>
+            <directory suffix=".php">./modules/avored/framework/src</directory>
         </whitelist>
     </filter>
     <!--logging>

tests/TestCase.php

@@ -4,8 +4,8 @@
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Faker\Factory;
-use AvoRed\Ecommerce\Models\Database\User;
-use AvoRed\Ecommerce\Models\Database\AdminUser;
+use AvoRed\Framework\Models\Database\User;
+use AvoRed\Framework\Models\Database\AdminUser;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -27,7 +27,7 @@ abstract class TestCase extends BaseTestCase
 
     /*
      *
-     * @var \AvoRed\Ecommerce\Models\Database\AdminUser
+     * @var \AvoRed\Framework\Models\Database\AdminUser
      */
     public $adminUser;
     /**