Merge branch 'fix-master-issues-v5' into 'master'

fix: profit loss report issue

See merge request mohit.panjvani/crater-web!1325

app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php

@@ -7,7 +7,7 @@ use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
 use Crater\Models\CompanySetting;
 use Crater\Models\Expense;
-use Crater\Models\Invoice;
+use Crater\Models\Payment;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use PDF;
@@ -31,10 +31,9 @@ class ProfitLossReportController extends Controller
 
         App::setLocale($locale);
 
-        $invoicesAmount = Invoice::whereCompanyId($company->id)
+        $paymentsAmount = Payment::whereCompanyId($company->id)
             ->applyFilters($request->only(['from_date', 'to_date']))
-            ->wherePaidStatus(Invoice::STATUS_PAID)
+            ->sum('base_amount');
-            ->sum('base_total');
 
         $expenseCategories = Expense::with('category')
             ->whereCompanyId($company->id)
@@ -68,7 +67,7 @@ class ProfitLossReportController extends Controller
 
         view()->share([
             'company' => $company,
-            'income' => $invoicesAmount,
+            'income' => $paymentsAmount,
             'expenseCategories' => $expenseCategories,
             'totalExpense' => $totalAmount,
             'colorSettings' => $colorSettings,

app/Models/Payment.php

@@ -312,6 +312,12 @@ class Payment extends Model implements HasMedia
             $query->whereCustomer($filters->get('customer_id'));
         }
 
+        if ($filters->get('from_date') && $filters->get('to_date')) {
+            $start = Carbon::createFromFormat('Y-m-d', $filters->get('from_date'));
+            $end = Carbon::createFromFormat('Y-m-d', $filters->get('to_date'));
+            $query->paymentsBetween($start, $end);
+        }
+
         if ($filters->get('orderByField') || $filters->get('orderBy')) {
             $field = $filters->get('orderByField') ? $filters->get('orderByField') : 'sequence_number';
             $orderBy = $filters->get('orderBy') ? $filters->get('orderBy') : 'desc';
@@ -319,6 +325,14 @@ class Payment extends Model implements HasMedia
         }
     }
 
+    public function scopePaymentsBetween($query, $start, $end)
+    {
+        return $query->whereBetween(
+            'payments.payment_date',
+            [$start->format('Y-m-d'), $end->format('Y-m-d')]
+        );
+    }
+
     public function scopeWhereOrder($query, $orderByField, $orderBy)
     {
         $query->orderBy($orderByField, $orderBy);

database/migrations/2020_12_02_090527_update_crater_version_400.php

@@ -38,7 +38,7 @@ class UpdateCraterVersion400 extends Migration
             // Update user's addresses
             if ($user->addresses()->exists()) {
                 foreach ($user->addresses as $address) {
-                    $address->company_id = $user->companies()->first()->id;
+                    $address->company_id = $user->company_id;
                     $address->user_id = null;
                     $address->save();
                 }

database/migrations/2021_06_28_105334_create_bouncer_tables.php

@@ -15,24 +15,24 @@ class CreateBouncerTables extends Migration
      */
     public function up()
     {
-        if (Schema::hasTable('roles')) {
+        if (Schema::hasTable('role_has_permissions')) {
-            Schema::drop(Models::table('roles'));
+            Schema::drop('role_has_permissions');
-        }
-
-        if (Schema::hasTable('permissions')) {
-            Schema::drop(Models::table('permissions'));
-        }
-
-        if (Schema::hasTable('model_has_permissions')) {
-            Schema::drop(Models::table('model_has_permissions'));
         }
 
         if (Schema::hasTable('model_has_roles')) {
-            Schema::drop(Models::table('model_has_roles'));
+            Schema::drop('model_has_roles');
         }
 
-        if (Schema::hasTable('role_has_permissions')) {
+        if (Schema::hasTable('model_has_permissions')) {
-            Schema::drop(Models::table('role_has_permissions'));
+            Schema::drop('model_has_permissions');
+        }
+
+        if (Schema::hasTable('permissions')) {
+            Schema::drop('permissions');
+        }
+
+        if (Schema::hasTable('roles')) {
+            Schema::drop('roles');
         }
 
         Schema::create(Models::table('abilities'), function (Blueprint $table) {

database/migrations/2021_06_28_120231_add_customer_id_to_payments_table.php

@@ -14,6 +14,7 @@ class AddCustomerIdToPaymentsTable extends Migration
     public function up()
     {
         Schema::table('payments', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->nullable();
             $table->unsignedBigInteger('customer_id')->nullable();
             $table->foreign('customer_id')->references('id')->on('customers');
         });

database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php

@@ -1,7 +1,13 @@
 <?php
 
+use Crater\Models\Address;
 use Crater\Models\Customer;
 use Crater\Models\CustomField;
+use Crater\Models\CustomFieldValue;
+use Crater\Models\Estimate;
+use Crater\Models\Expense;
+use Crater\Models\Invoice;
+use Crater\Models\Payment;
 use Crater\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
@@ -26,68 +32,46 @@ class UpdateCustomerIdInAllTables extends Migration
             foreach ($users as $user) {
                 $newCustomer = Customer::create($user->toArray());
 
-                $customFields = CustomField::where('model_type', 'User')->get();
+                Address::where('user_id', $user->id)->update([
+                    'customer_id' => $newCustomer->id,
+                    'user_id' => null
+                ]);
 
-                if ($customFields) {
+                Expense::where('user_id', $user->id)->update([
-                    $user->fields->map(function ($customFieldValue) use ($newCustomer) {
+                    'customer_id' => $newCustomer->id,
-                        $customFieldValue->custom_field_valuable_type = "Crater\Models\Customer";
+                    'user_id' => null
-                        $customFieldValue->custom_field_valuable_id = $newCustomer->id;
+                ]);
-                        $customFieldValue->save();
 
-                        $customField = $customFieldValue->customField;
+                Estimate::where('user_id', $user->id)->update([
-                        $customField->model_type = "Customer";
+                    'customer_id' => $newCustomer->id,
-                        $customField->slug = Str::upper('CUSTOM_'.$customField->model_type.'_'.Str::slug($customField->label, '_'));
+                    'user_id' => null
-                        $customField->save();
+                ]);
-                    });
-                }
 
-                if ($user->addresses()->exists()) {
+                Invoice::where('user_id', $user->id)->update([
-                    $user->addresses->map(function ($address) use ($newCustomer) {
+                    'customer_id' => $newCustomer->id,
-                        if ($address) {
+                    'user_id' => null
-                            $address->customer_id = $newCustomer->id;
+                ]);
-                            $address->user_id = null;
-                            $address->save();
-                        }
-                    });
-                }
 
-                if ($user->expenses()->exists()) {
+                Payment::where('user_id', $user->id)->update([
-                    $user->expenses->map(function ($expense) use ($newCustomer) {
+                    'customer_id' => $newCustomer->id,
-                        if ($expense) {
+                    'user_id' => null
-                            $expense->customer_id = $newCustomer->id;
+                ]);
-                            $expense->user_id = null;
-                            $expense->save();
-                        }
-                    });
-                }
 
-                if ($user->estimates()->exists()) {
+                CustomFieldValue::where('custom_field_valuable_id', $user->id)
-                    $user->estimates->map(function ($estimate) use ($newCustomer) {
+                    ->where('custom_field_valuable_type', 'Crater\Models\User')
-                        if ($estimate) {
+                    ->update([
-                            $estimate->customer_id = $newCustomer->id;
+                        'custom_field_valuable_type' => 'Crater\Models\Customer',
-                            $estimate->user_id = null;
+                        'custom_field_valuable_id' => $newCustomer->id
-                            $estimate->save();
+                    ]);
-                        }
+            }
-                    });
-                }
 
-                if ($user->invoices()->exists()) {
+            $customFields = CustomField::where('model_type', 'User')->get();
-                    $user->invoices->map(function ($invoice) use ($newCustomer) {
-                        if ($invoice) {
-                            $invoice->customer_id = $newCustomer->id;
-                            $invoice->user_id = null;
-                            $invoice->save();
-                        }
-                    });
-                }
 
-                if ($user->payments()->exists()) {
+            if ($customFields) {
-                    $user->payments->map(function ($payment) use ($newCustomer) {
+                foreach ($customFields as $customField) {
-                        if ($payment) {
+                    $customField->model_type = "Customer";
-                            $payment->customer_id = $newCustomer->id;
+                    $customField->slug = Str::upper('CUSTOM_'.$customField->model_type.'_'.Str::slug($customField->label, '_'));
-                            $payment->save();
+                    $customField->save();
-                        }
-                    });
                 }
             }
         }