Merge pull request #4668 from turbo124/v5-develop

Fixes for recurring invoice cron query
2025-11-03 23:57:33 -05:00 · 2021-01-12 08:20:52 +11:00 · 2021-01-12 08:20:52 +11:00 · 9e3b28f6ac
commit 9e3b28f6ac
parent a0cbfd350a 30cc2956a1
13 changed files with 72 additions and 8406 deletions
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@ -325,8 +325,8 @@ class CheckData extends Command
                // $total_amount = $invoice->payments->whereNull('deleted_at')->sum('pivot.amount');
                // $total_refund = $invoice->payments->whereNull('deleted_at')->sum('pivot.refunded');

-                $total_amount = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.amount');
-                $total_refund = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.refunded');
+                $total_amount = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->sum('pivot.amount');
+                $total_refund = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->sum('pivot.refunded');

                $total_invoice_payments += ($total_amount - $total_refund);
            }
--- a/app/Http/Controllers/OpenAPI/TaskSchema.php
+++ b/app/Http/Controllers/OpenAPI/TaskSchema.php
@ -12,7 +12,6 @@
 *       @OA\Property(property="project_id", type="string", example="", description="________"),
 *       @OA\Property(property="number", type="string", example="", description="________"),
 *       @OA\Property(property="time_log", type="string", example="", description="________"),
- *       @OA\Property(property="start_time", type="integer", example="", description="________"),
 *       @OA\Property(property="is_running", type="boolean", example=true, description="________"),
 *       @OA\Property(property="is_deleted", type="boolean", example=true, description="________"),
 *       @OA\Property(property="task_status_id", type="string", example="", description="________"),
--- a/app/Jobs/Cron/RecurringInvoicesCron.php
+++ b/app/Jobs/Cron/RecurringInvoicesCron.php
@ -41,8 +41,9 @@ class RecurringInvoicesCron
        nlog("Sending recurring invoices ".Carbon::now()->format('Y-m-d h:i:s'));

        if (! config('ninja.db.multi_db_enabled')) {
-            $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now())
+            $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now())
                                                        ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                                                        ->where('remaining_cycles', '!=', '0')
                                                        ->with('company')
                                                        ->cursor();

@ -60,8 +61,9 @@ class RecurringInvoicesCron
            foreach (MultiDB::$dbs as $db) {
                MultiDB::setDB($db);

-                $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now())
+                $recurring_invoices = RecurringInvoice::whereDate('next_send_date', '<=', now())
                                                        ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                                                        ->where('remaining_cycles', '!=', '0')
                                                        ->with('company')
                                                        ->cursor();

--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@ -65,15 +65,8 @@ class Gateway extends StaticModel
            $link = 'https://dashboard.stripe.com/account/apikeys';
        }

-        // $key = 'texts.gateway_help_'.$this->id;
-        // $str = trans($key, [
-        //     'link' => "<a href='$link' >Click here</a>",
-        //     'complete_link' => url('/complete'),
-        // ]);
-
        return $link;
        
-        //return $key != $str ? $str : '';
    }


@ -93,7 +86,7 @@ class Gateway extends StaticModel
                break;
            case 20:
                return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
-                        GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true],
+                        GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable']],
                        GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],
                        GatewayType::APPLE_PAY => ['refund' => false, 'token_billing' => false]]; //Stripe
                break;
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@ -36,7 +36,7 @@ class CompanyPresenter extends EntityPresenter
            $settings = $this->entity->settings;
        }

-        return (strlen($settings->company_logo) > 0) ? $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
+        return (strlen($settings->company_logo) > 0) ? url($settings->company_logo) : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
    }

    public function address($settings = null)
--- a/app/Repositories/TaskRepository.php
+++ b/app/Repositories/TaskRepository.php
@ -75,8 +75,8 @@ class TaskRepository extends BaseRepository
        }

        $task->time_log = json_encode($time_log);
-        $task->start_time = $task->start_time ?: $task->calcStartTime();
-        $task->duration = $task->calcDuration();
+        // $task->start_time = $task->start_time ?: $task->calcStartTime();
+        // $task->duration = $task->calcDuration();

        $task->save();

--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@ -142,7 +142,7 @@ class RefundPayment
     */
    private function setStatus()
    {
-        if ($this->refund_data['amount'] == $this->payment->amount) {
+        if ($this->total_refund == $this->payment->amount) {
            $this->payment->status_id = Payment::STATUS_REFUNDED;
        } else {
            $this->payment->status_id = Payment::STATUS_PARTIALLY_REFUNDED;
--- a/app/Transformers/TaskTransformer.php
+++ b/app/Transformers/TaskTransformer.php
@ -47,7 +47,7 @@ class TaskTransformer extends EntityTransformer
            'user_id' => (string) $this->encodePrimaryKey($task->user_id),
            'assigned_user_id' => (string) $this->encodePrimaryKey($task->assigned_user_id),
            'number' => (string) $task->number ?: '',
-            'start_time' => (int) $task->start_time,
+            // 'start_time' => (int) $task->start_time,
            'description' => (string) $task->description ?: '',
            'duration' => (int) $task->duration ?: 0,
            'rate' => (float) $task->rate ?: 0,
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@ -49,7 +49,7 @@ trait GeneratesCounter
        //todo handle if we have specific client patterns in the future
        $pattern = $client->getSetting('invoice_number_pattern');
        //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
            if (property_exists($client->settings, 'invoice_number_counter')) {
                $counter = $client->settings->invoice_number_counter;
            } else {
@ -57,7 +57,7 @@ trait GeneratesCounter
            }

            $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
            $counter = $client->group_settings->invoice_number_counter;
            $counter_entity = $client->group_settings;
        } else {
@ -96,10 +96,10 @@ trait GeneratesCounter
        //todo handle if we have specific client patterns in the future
        $pattern = $client->getSetting('credit_number_pattern');
        //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
            $counter = $client->settings->credit_number_counter;
            $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
            $counter = $client->group_settings->credit_number_counter;
            $counter_entity = $client->group_settings;
        } else {
@ -132,10 +132,10 @@ trait GeneratesCounter
        //todo handle if we have specific client patterns in the future
        $pattern = $client->getSetting('quote_number_pattern');
        //Determine if we are using client_counters
-        if (strpos($pattern, 'clientCounter')) {
+        if (strpos($pattern, 'clientCounter') || strpos($pattern, 'client_counter')) {
            $counter = $client->settings->{$used_counter};
            $counter_entity = $client;
-        } elseif (strpos($pattern, 'groupCounter')) {
+        } elseif (strpos($pattern, 'groupCounter') || strpos($pattern, 'group_counter')) {
            $counter = $client->group_settings->{$used_counter};
            $counter_entity = $client->group_settings;
        } else {
--- a/app/Utils/Traits/Uploadable.php
+++ b/app/Utils/Traits/Uploadable.php
@ -22,14 +22,9 @@ trait Uploadable
 {
    public function removeLogo($company)
    {
-        $company_logo = $company->settings->company_logo;

-        $file_name = basename($company_logo);
-
-        $storage_path = $company->company_key . '/' . $file_name;
-
-        if (Storage::exists($storage_path)) {
-            UnlinkFile::dispatchNow(config('filesystems.default'), $storage_path);
+        if (Storage::exists($company->settings->company_logo)) {
+            UnlinkFile::dispatchNow(config('filesystems.default'), $company->settings->company_logo);
        }
    }

@ -38,6 +33,8 @@ trait Uploadable
        if ($file) {
            $path = UploadAvatar::dispatchNow($file, $company->company_key);

+            $path = str_replace(config("ninja.app_url"), "", $path);
+
            info("the path {$path}");

            if ($path) {
--- a/database/migrations/2021_01_11_092056_fix_company_settings_url.php
+++ b/database/migrations/2021_01_11_092056_fix_company_settings_url.php
@ -0,0 +1,50 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FixCompanySettingsUrl extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        Company::all()->each(function ($company){
+
+            $settings = $company->settings;
+
+            $company_logo = $settings->company_logo;
+            $company_logo = str_replace(config('ninja.app_url'), '', $company_logo);
+
+            $settings->company_logo = $company_logo;
+
+            $company->settings = $settings;
+            $company->save();
+
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->dropColumn('logo');
+        });
+
+        Schema::table('tasks', function (Blueprint $table) {
+            $table->dropColumn('start_time');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
--- a/swagger.json
+++ b/swagger.json
--- a/tests/Feature/TaskApiTest.php
+++ b/tests/Feature/TaskApiTest.php
@ -71,7 +71,6 @@ class TaskApiTest extends TestCase
        $arr = $response->json();
        $response->assertStatus(200);

-        $this->assertGreaterThan(0, $arr['data']['start_time']);
    }

    public function testTaskPut()