Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into activity-route-log-dev

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameLogic.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyName;
-use App\Http\Resources\CompanyResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyNameLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company',
-            'message' => 'You have successfully updated the Company'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var UpdatesCompanyName */
-    private $updatesCompanyName;
-
-    /** @var UpdatesCompanyModuleName */
-    private $updatesCompanyModuleName;
-
-    /**
-     * UpdateCompanyControllersLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param UpdatesCompanyName $updatesCompany
-     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
-     */
-    public function __construct(FetchesCompany $fetchesCompany,UpdatesCompanyName $updatesCompanyName, UpdatesCompanyModuleName $updatesCompanyModuleName)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->updatesCompanyName = $updatesCompanyName;
-        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $object = new CompanyObject($request->input('name'), $query->reference, $query->type);
-
-        $this->updatesCompanyName->execute($query, $object);
-
-        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
-
-        return $this->resourceResponse(new CompanyResource($query));
-
-    }
-
-}

app/Classes/Modules/Companies/Services/UpdatesCompanyName.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Models\Company;
-
-class UpdatesCompanyName extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Company $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $model, CompanyObject $object)
-    {
-        $model->name = $object->getName();
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/Exports/Services/ExportsCustomerTotalOrderByYear.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\CompanyModule;
-use App\Models\Company;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Illuminate\Http\Request;
-
-class ExportsCustomerTotalOrderByYear implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-    use Exportable;
-
-    private $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'CompanyId',
-            'CompanyName',
-            'CompanyReference',
-            'TotalCbm'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($container){
-            return $container->where('loading_date', '>=', Carbon::parse('01-01-' . $this->request->route('year')))
-                ->where('loading_date', '<=', Carbon::parse('31-12-' . $this->request->route('year')));
-        })->get();
-
-        $packingLists = $packingLists->groupBy(function ($packingList){
-            return $packingList->owner->company_module_id;
-        })->sortByDesc(function($companyModule){
-            return $companyModule->sum(function($packingList){
-                return $packingList->packages->sum(function ($package){
-                    return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
-                });
-            });
-        })->take(10);
-        return $packingLists;
-    }
-
-    /**
-     * @param $row
-     * @return array
-     */
-    public function map($row): array
-    {
-
-        $companyModule = $row[0]->owner->companyModule;
-        $marking = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-
-        $cbm = $row->sum(function($packingList){
-            return $packingList->packages->sum(function ($package){
-                return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
-            });
-        });
-
-        return [
-            $companyModule->company_id,
-            $companyModule->name,
-            $marking,
-            $cbm
-        ];
-    }
-}

app/Classes/ValueObjects/Constants/RouteType.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class RouteType {
+
+    public const WEB = 1;
+
+    public const API = 2;
+
+}

app/Http/Controllers/Companies/UpdateCompanyNameController.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Companies;
-
-use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameLogic;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyNameController extends Controller
-{
-    /**
-     * @param Request $request
-     * @param UpdateCompanyLogic $logic
-     * @return JsonResponse
-     */
-    public function rename(Request $request, UpdateCompanyNameLogic $logic): JsonResponse
-    {
-        return $logic->execute($request);
-    }
-}

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Exports;
 
 
 use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
-use App\Classes\Modules\Exports\Services\ExportsCustomerTotalOrderByYear;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -32,11 +31,4 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
-
-    public function totalOrders(Request $request){
-        $exportsTotalOrders = new ExportsCustomerTotalOrderByYear($request);
-        $response = $exportsTotalOrders->download('total-orders-' . $request->route('year') . '.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-        ob_end_clean();
-        return $response;
-    }
 }

app/Http/Kernel.php

@@ -38,11 +38,13 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\WebRouteLogs::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ApiRouteLogs::class,
         ],
     ];
 

app/Http/Middleware/ApiRouteLogs.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use App\Models\RouteLog;
+use App\Classes\ValueObjects\Constants\RouteType;
+use Illuminate\Support\Facades\Auth;
+
+class ApiRouteLogs
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+	 */
+	public function handle(Request $request, Closure $next)
+	{
+		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
+		$url = urldecode($request->fullUrl());
+		$request_method = $request->method();
+		$platform = $request->header('sec-ch-ua-platform');
+		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
+		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
+		$longitude = $geo["geoplugin_longitude"];
+		$latitude = $geo["geoplugin_latitude"];
+		$last_page = url()->previous();
+		$countryName = $geo["geoplugin_countryName"];
+
+		$user_id = Auth::user() ? Auth::user()->id : 0;
+
+		// if ($user_id != 0) {
+		// 	// $ip_address
+		// 	$webRouteLogWithSameIp = RouteLog::where('ip_address', $ip_address)->where('user_id', 0)->get();
+		// 	dd($webRouteLogWithSameIp);
+		// 	foreach($webRouteLogWithSameIp as $result){
+		// 		$result
+		// 	}
+		// }
+
+		$route_log = [
+		    'user_id' => $user_id,
+		    // 'ip_address' => $request->ip(),
+		    'ip_address' => $ip_address,
+		    'url' => $url,
+		    'request_method' => $request_method,
+		    'browser' => $browser,
+		    'platform' => $platform,
+		    'longitude' => $longitude,
+		    'latitude' => $latitude,
+		    'last_page' => $last_page,
+		    'countryname' => $countryName,
+		    'route_type' => RouteType::API,
+		];
+
+		RouteLog::create($route_log);
+
+		return $next($request);
+	}
+}

app/Http/Middleware/WebRouteLogs.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use App\Models\RouteLog;
+use App\Classes\ValueObjects\Constants\RouteType;
+use Illuminate\Support\Facades\Auth;
+
+class WebRouteLogs
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+	 */
+	public function handle(Request $request, Closure $next)
+	{
+		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
+		$url = $request->fullUrl();
+		$request_method = $request->method();
+		$platform = $request->header('sec-ch-ua-platform');
+		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
+		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
+		$longitude = $geo["geoplugin_longitude"];
+		$latitude = $geo["geoplugin_latitude"];
+		$last_page = url()->previous();
+		$countryName = $geo["geoplugin_countryName"];
+
+		$route_log = [
+		    'user_id' => Auth::user() ? Auth::user()->id : 0,
+		    // 'ip_address' => $request->ip(),
+		    'ip_address' => $ip_address,
+		    'url' => $url,
+		    'request_method' => $request_method,
+		    'browser' => $browser,
+		    'platform' => $platform,
+		    'longitude' => $longitude,
+		    'latitude' => $latitude,
+		    'last_page' => $last_page,
+		    'countryname' => $countryName,
+		    'route_type' => RouteType::WEB,
+		];
+
+		// dd($route_log);
+
+		RouteLog::create($route_log);
+
+		return $next($request);
+	}
+}

app/Http/Resources/PackageResource.php

@@ -29,7 +29,6 @@ class PackageResource extends JsonResource
             'weight' => $this->weight,
             'quantity' => $this->quantity,
             'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
-            'reference' => $this->packingList->reference,
             'status' => $this->status,
             $this->mergeWhen($originalPackingList->owner instanceof Order, [
                 'order' => New OrderResource($originalPackingList->owner)

app/Models/RouteLog.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class RouteLog extends Model
+{
+    use HasFactory;
+
+   protected $fillable = [
+        'user_id',
+        'ip_address',
+        'url',
+        'request_method',
+        'browser',
+        'platform',
+        'longitude',
+        'latitude',
+        'last_page',
+        'countryname',
+        'route_type'
+   ];
+}

database/migrations/2022_12_27_165842_create_route_logs_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRouteLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('route_logs', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->unsigned();
+            $table->string('ip_address');
+            $table->string('url', 255);
+            $table->string('request_method');
+            $table->string('browser')->nullable();
+            $table->string('platform')->nullable();
+            $table->string('longitude')->nullable();
+            $table->string('latitude')->nullable();
+            $table->string('last_page')->nullable();
+            $table->string('countryname')->nullable();
+            $table->integer('route_type');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('route_logs');
+    }
+}

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -19,12 +19,6 @@
                                     <p class="bold m-b-5 fs-12">{{item.description}}</p>
                                 </div>
                             </div>
-                            <div class="row m-b-10 align-items-center" v-if="$store.getters.isAdmin">
-                                <div class="col-auto">
-                                    <p class="no-margin all-caps fs-10 lh-10 light">Reference</p>
-                                    <p class="no-margin fs-12">{{item.reference}}</p>
-                                </div>
-                            </div>
                             <div class="row b-t b-b b-grey m-b-15">
                                 <div class="col">
                                     <div class="row">
@@ -180,4 +174,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
+</script>

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -67,14 +67,6 @@
                             <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
                         </div>
                     </div>
-                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
-                        <div class="col-auto p-r-5">
-                            <p class="no-margin all-caps fs-10 light">Reference</p>
-                        </div>
-                        <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.reference}}</p>
-                        </div>
-                    </div>
                     <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>

routes/company.php

@@ -8,7 +8,6 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::post('/create', 'CreateCompanyController@create')->name('create');
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
-    Route::put('/name/update/{id}', 'UpdateCompanyNameController@rename')->name('update.name');
 
     Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
 

routes/web.php

@@ -317,7 +317,6 @@ Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPack
 Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export');
 Route::get('/export/parcel-summary', 'Exports\ExportArrivedParcelController@summary');
 Route::get('/export/parcel-postcode', 'Exports\ExportParcelPostcodesController@export');
-Route::get('/export/{year}/customer-total-order', 'Exports\ExportCustomersToExcelController@totalOrders');
 
 Route::get('/settings', function () {
     return view('pages.settings');