Merge branch 'master' into 'remark-create-api'

# Conflicts:
#   app/Models/Container.php
#   app/Models/PackingList.php
#   routes/order.php
#   routes/packing_list.php

app/Http/Controllers/Accounts/UserCrossAuthenticationController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Accounts;
+
+use App\Classes\Modules\Accounts\ControllersLogic\CrossAuthenticateUserLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UserCrossAuthenticationController
+{
+
+    /**
+     * @param Request $request
+     * @param CrossAuthenticateUserLogic $logic
+     * @return JsonResponse
+     */
+    public function authenticate(Request $request, CrossAuthenticateUserLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Companies/AssignCompanyConnectionToConnectionSegmentController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\AssignCompanyConnectionToConnectionSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignCompanyConnectionToConnectionSegmentController
+{
+    /**
+     * @param Request $request
+     * @param AssignCompanyToSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function assign(Request $request, AssignCompanyConnectionToConnectionSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Companies/RemoveCompanyConnectionFromConnectionSegmentController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\RemoveCompanyConnectionFromConnectionSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RemoveCompanyConnectionFromConnectionSegmentController
+{
+    /**
+     * @param Request $request
+     * @param RemoveCompanyConnectionFromConnectionSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function detach(Request $request, RemoveCompanyConnectionFromConnectionSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Orders/ShippingCostController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\ShippingCostLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ShippingCostController
+{
+    /**
+     * @param Request $request
+     * @param ShippingCostLogic $logic
+     * @return JsonResponse
+     */
+    public function calculate(Request $request, ShippingCostLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/PackingLists/Containers/CreateContainerRemarkController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists\Containers;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\Containers\CreateContainerRemarkLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateContainerRemarkController
+{
+
+    public function create(Request $request, CreateContainerRemarkLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/PackingLists/CreateDeliverPackingListController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\CreateDeliverPackingListLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateDeliverPackingListController
+{
+    /**
+     * @param Request $request
+     * @param CreateDeliverPackingListLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateDeliverPackingListLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -5,9 +5,8 @@ namespace App\Http\Controllers\Reports;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\HttpStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
-use App\Models\Company;
+use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Container;
 use App\Models\Order;
@@ -19,9 +18,24 @@ use Illuminate\Http\Request;
 class MonthlyReportController
 {
     public function salesReport(Request $request): JsonResponse {
-        $today = Carbon::now();
-        $containers = Container::whereMonth('loading_date', $today->format('m'))->whereYear('loading_date', $today->format('Y'))->orderBy('loading_date')->get();
+        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
+        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
 
+        $receivedCbm = Package::warehouseReceiveList()->whereHas('deliveryTransports', function ($transport) use ($from, $to) {
+            return $transport->whereBetween('drop_date', [$from, $to]);
+        })->get()->sum(function($package){
+            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        });
+
+        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+
+        $customers = $containers->flatMap(function ($container) {
+            return $container->companyModules;
+        })->unique();
+
+        $orders = $containers->flatMap(function ($container) {
+            return $container->orders;
+        })->unique();
 
         $packages = $containers->flatMap(function ($container) {
             return $container->packages;
@@ -31,19 +45,17 @@ class MonthlyReportController
             return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
         });
 
-        $customers = $containers->flatMap(function($container){
-            return $container->companyModules;
-        })->unique();
+        $newCustomers = CompanyModule::where('type', BusinessType::IMPORTER)->whereBetween('created_at', [$from, $to])->count();
+        $newConvertedCustomers = CompanyModule::where('type', BusinessType::IMPORTER)->whereBetween('created_at', [$from, $to])->whereHas('orders', function($order){
+            return $order->whereHas('packingLists');
+        })->count();
 
-        $orders = $containers->flatMap(function($container){
-            return $container->orders;
-        })->unique();
-
-        $days = Carbon::now()->addDay()->diffInDaysFiltered(function (Carbon $date) {
+        $startDay = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now();
+        $days = $startDay->addDay()->diffInDaysFiltered(function (Carbon $date) {
 
             return $date->isWeekday();
 
-        }, Carbon::now()->endOfMonth());
+        }, $request->route('to') ? Carbon::parse($request->route('to'))->endOfMonth() : Carbon::now()->endOfMonth());
 
         return (new ApiResponseObject('fetch monthly report Successful',
             '',
@@ -51,15 +63,93 @@ class MonthlyReportController
                 'containers' => count($containers),
                 'activated_orders' => count($orders),
                 'active_customers' => count($customers),
-                'new_customers' => CompanyModule::where('type', BusinessType::IMPORTER)->whereMonth('created_at', $today->format('m'))->whereYear('created_at', $today->format('Y'))->count(),
-                'new_converted_customers' => CompanyModule::where('type', BusinessType::IMPORTER)->whereMonth('created_at', $today->format('m'))->whereYear('created_at', $today->format('Y'))->whereHas('orders', function($order){
-                    return $order->whereHas('packingLists');
-                })->count(),
+                'new_customers' => $newCustomers,
+                'new_converted_customers' => $newConvertedCustomers,
                 'total_customers' => CompanyModule::where('type', BusinessType::IMPORTER)->count(),
+                'received_cbm' => $receivedCbm,
+                'total_cbm' => $totalCbm,
+                'daily_cbm' => $days ? (800 - $totalCbm) / $days : (800 - $totalCbm),
+                'packages' => $packages->sum('quantity'),
+                'total_orders' => Order::whereBetween('created_at', [$from, $to])->count()
+            ]]))->handler();
+    }
+
+    public function profitModelReport(Request $request): JsonResponse {
+        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
+        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
+        $model = (int) $request->route('model');
+        $value = (float) $request->route('value');
+
+
+        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+
+        $packages = $containers->flatMap(function ($container) {
+            return $container->packages;
+        });
+
+        $totalCbm = $packages->sum(function($package){
+            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        });
+
+        $projectedCbm = $packages->sum(function($package) use ($value, $model) {
+
+            if($model === 2){
+                return (( (float) ($package->width + ($package->width * ($value/100))) / 100) * ( (float) ($package->length + ($package->length * ($value/100))) / 100) * ( (float) ($package->height + ($package->height * ($value/100))) / 100)) * $package->quantity;
+            }
+
+            if($model === 3){
+                return ((( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) + $value) * $package->quantity;
+            }
+
+            if($model === 4){
+                $packageCbm = (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100));
+                return ( $packageCbm + ($packageCbm * ($value/100))) * $package->quantity;
+            }
+
+            return (( (float) ($package->width + $value) / 100) * ( (float) ($package->length + $value) / 100) * ( (float) ($package->height + $value) / 100)) * $package->quantity;
+
+        });
+
+        return (new ApiResponseObject('fetch monthly report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE, ['data' => [
+                'total_cbm' => $totalCbm,
+                'projected_cbm' => $projectedCbm,
+            ]]))->handler();
+    }
+
+    public function customerReport(Request $request): JsonResponse {
+
+        $connection = CompanyConnection::where('invitee_reference', $request->route('marking'))->firstOrFail();
+        $id = $connection->invitee->id;
+
+        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::parse('01-01-2018');
+        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now();
+
+        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
+
+        $packages = $containers->flatMap(function ($container) {
+            return $container->packages;
+        });
+
+        $packages = $packages->filter(function($package) use ($id) {
+            return $package->companyModule->id === $id;
+        });
+
+        $orders = $packages->unique(function ($package) {
+            return $package->order;
+        });
+
+        $totalCbm = $packages->sum(function($package){
+            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
+        });
+
+        return (new ApiResponseObject('fetch monthly report Successful',
+            '',
+            HttpStatus::OK_WITH_MESSAGE, ['data' => [
+                'activated_orders' => count($orders),
                 'total_cbm' => $totalCbm,
-                'daily_cbm' => (800 - $totalCbm) / $days,
                 'packages' => $packages->sum('quantity'),
-                'total_orders' => Order::whereMonth('created_at', $today->format('m'))->whereYear('created_at', $today->format('Y'))->count()
             ]]))->handler();
     }
 
@@ -74,11 +164,11 @@ class MonthlyReportController
                 })->sum('quantity'),
                 'in_transit' => (float) Package::shippingList()->Shipping()->whereHas('shippingSchedules', function($schedule){
                     return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->whereDoesntHave('shippingSchedules', function($schedule){
-                    return $schedule->dropped()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->whereDoesntHave('container', function($container){
+                    return $container->where('containers.status', ApprovalStatus::COMPLETED);
                 })->sum('quantity'),
-                'pending_delivery' => (float) Package::shippingList()->whereHas('shippingSchedules', function($schedule){
-                    return $schedule->dropped()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                'pending_delivery' => (float) Package::shippingList()->whereHas('container', function($container){
+                    return $container->where('containers.status', ApprovalStatus::COMPLETED);
                 })->whereDoesntHave('deliverySchedules', function($schedule){
                     return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 })->sum('quantity'),

app/Http/Controllers/Segments/CreateSegmentController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\CreateSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateSegmentController
+{
+    /**
+     * @param Request $request
+     * @param CreateSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Segments/DeleteSegmentController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\DeleteSegmentLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteSegmentController
+{
+    /**
+     * @param Request $request
+     * @param DeleteSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function destroy(Request $request, DeleteSegmentLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}