Merge pull request #468 from avored/developed

Developed to master

app/Http/Controllers/Account/OrderCommentController.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Http\Controllers\Account;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Account\OrderCommentRequest;
+use App\Mails\OrderCommentMail;
+use AvoRed\Framework\Database\Contracts\ConfigurationModelInterface;
+use AvoRed\Framework\Database\Contracts\OrderCommentModelInterface;
+use AvoRed\Framework\Database\Models\Customer;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Mail;
+
+class OrderCommentController extends Controller
+{
+
+    /**
+     * Order Comment Repository
+     * @param OrderCommentRepository $orderCommentRepository
+     */
+    protected $orderCommentRepository;
+    /**
+     * Configuration Repository
+     * @param ConfigurationRepository $configurationRepository
+     */
+    protected $configurationRepository;
+
+
+    /**
+     * Order Comment Construct
+     * @param OrderCommentRepository $orderCommentRepository
+     */
+    public function __construct(
+        OrderCommentModelInterface $orderCommentRepository,
+        ConfigurationModelInterface $configurationRepository
+    ) {
+        $this->orderCommentRepository = $orderCommentRepository;
+        $this->configurationRepository = $configurationRepository;
+    }
+
+    /**
+     * Store Order Comment into database
+     * @param int $orderId //Do not need route binding at this stage.
+     * @param OrderCommentRequest $request
+     * @return Redirect
+     */
+    public function store($orderId, OrderCommentRequest $request)
+    {
+        $data = $request->all();
+        $data['order_id'] = $orderId;
+        $data['commentable_id'] = Auth::guard('customer')->user()->id;
+        $data['commentable_type'] = Customer::class;
+        $data['is_private'] = false;
+
+        $this->orderCommentRepository->create($data);
+        $email = $this->configurationRepository->getValueByCode('order_email_address');
+        $url = route('admin.order.show', $orderId);
+        Mail::to($email)->send(new OrderCommentMail($url));   
+
+        return redirect()->route('account.order.show', $orderId);
+    }
+
+}

app/Http/Controllers/Account/OrderController.php

@@ -47,6 +47,7 @@ public function index()
      */
     public function show(Order $order)
     {
+        $order->load(['products', 'orderComments.commentable', 'customer', 'shippingAddress.country', 'billingAddress.country']);
         return view('account.order.show')
             ->with(compact('order'));
     }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -4,6 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
@@ -29,4 +31,23 @@ public function __construct()
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Using an Customer Guard for the Auth.
+     * @return \Illuminate\Auth\SessionGuard
+     */
+    protected function guard()
+    {
+        return Auth::guard('customer');
+    }
+
+    /**
+     * Get the broker to be used during password reset.
+     *
+     * @return \Illuminate\Contracts\Auth\PasswordBroker
+     */
+    public function broker()
+    {
+        return Password::broker('customers');
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -77,7 +77,7 @@ protected function create(array $data)
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],
             'email' => $data['email'],
-            'password' => $data['password'],
+            'password' => bcrypt($data['password']),
         ]);
     }
 

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -4,6 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Password;
 
 class ResetPasswordController extends Controller
 {
@@ -25,7 +27,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -36,4 +38,23 @@ public function __construct()
     {
         $this->middleware('guest');
     }
+
+    /**
+     * Using an Customer Guard for the Auth.
+     * @return \Illuminate\Auth\SessionGuard
+     */
+    protected function guard()
+    {
+        return Auth::guard('customer');
+    }
+
+    /**
+     * Get the broker to be used during password reset.
+     *
+     * @return \Illuminate\Contracts\Auth\PasswordBroker
+     */
+    public function broker()
+    {
+        return Password::broker('customers');
+    }
 }

app/Http/Requests/Account/OrderCommentRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\Account;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class OrderCommentRequest 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()
+    {
+        return [
+            'content' => 'required'
+        ];
+    }
+}

app/Mails/OrderCommentMail.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Mails;
+
+use AvoRed\Framework\Database\Models\Order;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class OrderCommentMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * User Order Show Url
+     * @param string $url
+     */
+    public $url;
+
+
+    public function __construct(string $url)
+    {
+        $this->url = $url;
+    }
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this
+            ->subject('Order Comment')
+            ->markdown('mails.comment-mail')
+            ->with('url', $this->url);
+    }
+}

package.json

@@ -10,7 +10,7 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "dependencies": {
-        "avored-components": "^0.1.6",
+        "avored-components": "^0.1",
         "axios": "^0.19.2",
         "cross-env": "^7.0.2",
         "laravel-mix": "^5.0.4",

resources/components/CartPage.vue

@@ -93,8 +93,7 @@ export default {
                 this.total += item.tax
                 this.totalTax += item.tax
             })
-
-             this.total = this.subtotal + this.totalTax
+            this.total = this.subtotal + this.totalTax
         }
     }
 };

resources/components/CheckoutPage.vue

@@ -80,14 +80,15 @@ export default {
             this.shippingOption = val
         },
         changeSelectedShippingAddress(val) {
-            console.log(val[0] == this.newShippingAddressId)
+
+            console.log(val[0])
             if (val[0] == this.newShippingAddressId) {
                 this.displayShippingAddressFields = true
                 this.selectedShippingAddress = null
                 this.shippingAddressId = null
             } else {
                 this.selectedShippingAddress = this.shippingAddresses[val[0]]
-                this.shippingAddressId = this.shippingAddresses[val[0]]
+                this.shippingAddressId = val[0]
                 this.displayShippingAddressFields = false
             }
         },
@@ -98,7 +99,7 @@ export default {
                 this.billingAddressId = null
             } else {
                 this.selectedBillingAddress = this.billingAddresses[val[0]]
-                this.billingAddressId = this.billingAddresses[val[0]]
+                this.billingAddressId = val[0]
                 this.displayBillingAddressFields = false
             }
         },

resources/components/account/order/OrderShow.vue

@@ -0,0 +1,22 @@
+<script>
+import VueSimplemde from 'vue-simplemde'
+
+
+export default {
+  props: [],
+  components: {
+    'vue-simplemde': VueSimplemde
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    
+  }
+};
+</script>
+<style>
+  @import '~simplemde/dist/simplemde.min.css';
+</style>

resources/js/app.js

@@ -22,6 +22,7 @@ import './services/components'
 
 /*************** AVORED CREATED VUE COMPONENTS ***************/
 
+Vue.component('user-order-show', require('../components/account/order/OrderShow.vue').default)
 Vue.component('address-save', require('../components/address/AddressSave.vue').default)
 Vue.component('user-order-table', require('../components/account/order/OrderTable.vue').default)
 Vue.component('account-upload', require('../components/account/AccountUpload.vue').default)

resources/lang/en/avored.php

@@ -31,6 +31,11 @@
     ],
 
     'home' => 'Home',
+    'reset_password' => 'Reset Password',
+    'login' => 'Login',
+    'password_update' => 'Update Password',
+    'user_dashboard' => 'User Dashboard',
+    'show_order' => 'Show Order',
     'cart' => 'Cart',
     'page' => 'Page',
     'product' => 'Product',