Merge pull request #7500 from turbo124/v5-develop

Fixes for gocardless events.

VERSION.txt

@@ -1 +1 @@
-5.3.93
+5.3.94

app/Factory/RecurringInvoiceFactory.php

@@ -48,6 +48,7 @@ class RecurringInvoiceFactory
         $invoice->frequency_id = RecurringInvoice::FREQUENCY_MONTHLY;
         $invoice->last_sent_date = null;
         $invoice->next_send_date = null;
+        $invoice->next_send_date_client = null;
         $invoice->remaining_cycles = -1;
         $invoice->paid_to_date = 0;
         $invoice->auto_bill_enabled = false;

app/Http/Controllers/RecurringInvoiceController.php

@@ -204,9 +204,9 @@ class RecurringInvoiceController extends BaseController
     {
         $recurring_invoice = $this->recurring_invoice_repo->save($request->all(), RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
-        $offset = $recurring_invoice->client->timezone_offset();
+        // $offset = $recurring_invoice->client->timezone_offset();
-        $recurring_invoice->next_send_date = Carbon::parse($recurring_invoice->next_send_date)->startOfDay()->addSeconds($offset);
+        // $recurring_invoice->next_send_date = Carbon::parse($recurring_invoice->next_send_date)->startOfDay()->addSeconds($offset);
-        $recurring_invoice->saveQuietly();
+        // $recurring_invoice->saveQuietly();
 
         $recurring_invoice->service()
                           ->triggeredActions($request)

app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php

@@ -55,6 +55,10 @@ class StoreRecurringExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
+            $input['next_send_date_client'] = $input['next_send_date'];
+        }   
+        
         if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
             $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
         }

app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php

@@ -66,6 +66,10 @@ class UpdateRecurringExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
+            $input['next_send_date_client'] = $input['next_send_date'];
+        }   
+        
         if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
             $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
         }

app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php

@@ -67,6 +67,10 @@ class StoreRecurringInvoiceRequest extends Request
     {
         $input = $this->all();
 
+        if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
+            $input['next_send_date_client'] = $input['next_send_date'];
+        }        
+
         if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }

app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php

@@ -61,6 +61,10 @@ class UpdateRecurringInvoiceRequest extends Request
     {
         $input = $this->all();
 
+        if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
+            $input['next_send_date_client'] = $input['next_send_date'];
+        }    
+        
         if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }

app/Jobs/Cron/RecurringExpensesCron.php

@@ -94,6 +94,8 @@ class RecurringExpensesCron
         $expense->save();
 
         $recurring_expense->next_send_date = $recurring_expense->nextSendDate();
+        $recurring_expense->next_send_date_client = $recurring_expense->next_send_date;
+
         $recurring_expense->remaining_cycles = $recurring_expense->remainingCycles();
         $recurring_expense->save();
     }

app/Jobs/RecurringInvoice/SendRecurring.php

@@ -105,6 +105,7 @@ class SendRecurring implements ShouldQueue
         nlog("updating recurring invoice dates");
         /* Set next date here to prevent a recurring loop forming */
         $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate();
+        $this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient();
         $this->recurring_invoice->remaining_cycles = $this->recurring_invoice->remainingCycles();
         $this->recurring_invoice->last_sent_date = now();
 

app/Models/Client.php

@@ -667,6 +667,8 @@ class Client extends BaseModel implements HasLocalePreference
         $offset -= $timezone->utc_offset;
         $offset += ($entity_send_time * 3600);
 
+        nlog("offset = {$offset}");
+        
         return $offset;
     }
 

app/Models/RecurringExpense.php

@@ -63,6 +63,7 @@ class RecurringExpense extends BaseModel
         'last_sent_date',
         'next_send_date',
         'remaining_cycles',
+        'next_send_date_client',
     ];
 
     protected $casts = [
@@ -153,6 +154,43 @@ class RecurringExpense extends BaseModel
         }
     }
 
+
+    public function nextSendDateClient() :?Carbon
+    {
+        if (!$this->next_send_date) {
+            return null;
+        }
+
+        switch ($this->frequency_id) {
+            case RecurringInvoice::FREQUENCY_DAILY:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addDay();
+            case RecurringInvoice::FREQUENCY_WEEKLY:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addWeek();
+            case RecurringInvoice::FREQUENCY_TWO_WEEKS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addWeeks(2);
+            case RecurringInvoice::FREQUENCY_FOUR_WEEKS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addWeeks(4);
+            case RecurringInvoice::FREQUENCY_MONTHLY:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthNoOverflow();
+            case RecurringInvoice::FREQUENCY_TWO_MONTHS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(2);
+            case RecurringInvoice::FREQUENCY_THREE_MONTHS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(3);
+            case RecurringInvoice::FREQUENCY_FOUR_MONTHS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(4);
+            case RecurringInvoice::FREQUENCY_SIX_MONTHS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(6);
+            case RecurringInvoice::FREQUENCY_ANNUALLY:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addYear();
+            case RecurringInvoice::FREQUENCY_TWO_YEARS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addYears(2);
+            case RecurringInvoice::FREQUENCY_THREE_YEARS:
+                return Carbon::parse($this->next_send_date)->startOfDay()->addYears(3);
+            default:
+                return null;
+        }
+    }
+
     public function remainingCycles() : int
     {
         if ($this->remaining_cycles == 0) {

app/Models/RecurringInvoice.php

@@ -108,6 +108,7 @@ class RecurringInvoice extends BaseModel
         'assigned_user_id',
         'exchange_rate',
         'vendor_id',
+        'next_send_date_client',
     ];
 
     protected $casts = [
@@ -224,7 +225,7 @@ class RecurringInvoice extends BaseModel
 
     public function nextSendDate() :?Carbon
     {
-        if (!$this->next_send_date) {
+        if (!$this->next_send_date_client) {
             return null;
         }
 
@@ -236,49 +237,93 @@ class RecurringInvoice extends BaseModel
 
                 /* Lets set the next send date to now so we increment from today, rather than in the past*/
                 if(Carbon::parse($this->next_send_date)->lt(now()->subDays(3)))
-                    $this->next_send_date = now()->format('Y-m-d');
+                    $this->next_send_date_client = now()->format('Y-m-d');
 
             }
         
-
-
         /* 
         As we are firing at UTC+0 if our offset is negative it is technically firing the day before so we always need
         to add ON a day - a day = 86400 seconds
         */
-        if($offset < 0)
+        // if($offset < 0)
-            $offset += 86400;
+        //     $offset += 86400;
 
         switch ($this->frequency_id) {
             case self::FREQUENCY_DAILY:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addDay()->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addDay()->addSeconds($offset);
             case self::FREQUENCY_WEEKLY:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addWeek()->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeek()->addSeconds($offset);
             case self::FREQUENCY_TWO_WEEKS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addWeeks(2)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeeks(2)->addSeconds($offset);
             case self::FREQUENCY_FOUR_WEEKS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addWeeks(4)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeeks(4)->addSeconds($offset);
             case self::FREQUENCY_MONTHLY:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthNoOverflow()->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthNoOverflow()->addSeconds($offset);
             case self::FREQUENCY_TWO_MONTHS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(2)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(2)->addSeconds($offset);
             case self::FREQUENCY_THREE_MONTHS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(3)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(3)->addSeconds($offset);
             case self::FREQUENCY_FOUR_MONTHS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(4)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(4)->addSeconds($offset);
             case self::FREQUENCY_SIX_MONTHS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addMonthsNoOverflow(6)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(6)->addSeconds($offset);
             case self::FREQUENCY_ANNUALLY:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addYear()->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYear()->addSeconds($offset);
             case self::FREQUENCY_TWO_YEARS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addYears(2)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYears(2)->addSeconds($offset);
             case self::FREQUENCY_THREE_YEARS:
-                return Carbon::parse($this->next_send_date)->startOfDay()->addYears(3)->addSeconds($offset);
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYears(3)->addSeconds($offset);
             default:
                 return null;
         }
     }
 
+    public function nextSendDateClient() :?Carbon
+    {
+        if (!$this->next_send_date_client) {
+            return null;
+        }
+
+        /* If this setting is enabled, the recurring invoice may be set in the past */
+            
+            if($this->company->stop_on_unpaid_recurring) {
+
+                /* Lets set the next send date to now so we increment from today, rather than in the past*/
+                if(Carbon::parse($this->next_send_date)->lt(now()->subDays(3)))
+                    $this->next_send_date_client = now()->format('Y-m-d');
+
+            }
+
+        switch ($this->frequency_id) {
+            case self::FREQUENCY_DAILY:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addDay();
+            case self::FREQUENCY_WEEKLY:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeek();
+            case self::FREQUENCY_TWO_WEEKS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeeks(2);
+            case self::FREQUENCY_FOUR_WEEKS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addWeeks(4);
+            case self::FREQUENCY_MONTHLY:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthNoOverflow();
+            case self::FREQUENCY_TWO_MONTHS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(2);
+            case self::FREQUENCY_THREE_MONTHS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(3);
+            case self::FREQUENCY_FOUR_MONTHS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(4);
+            case self::FREQUENCY_SIX_MONTHS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addMonthsNoOverflow(6);
+            case self::FREQUENCY_ANNUALLY:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYear();
+            case self::FREQUENCY_TWO_YEARS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYears(2);
+            case self::FREQUENCY_THREE_YEARS:
+                return Carbon::parse($this->next_send_date_client)->startOfDay()->addYears(3);
+            default:
+                return null;
+        }
+    }    
+
     public function nextDateByFrequency($date)
     {
         $offset = $this->client->timezone_offset();
@@ -463,11 +508,11 @@ class RecurringInvoice extends BaseModel
 
         $data = [];
 
-        if (!Carbon::parse($this->next_send_date)) {
+        if (!Carbon::parse($this->next_send_date_client)) {
             return $data;
         }
 
-        $next_send_date = Carbon::parse($this->next_send_date)->copy();
+        $next_send_date = Carbon::parse($this->next_send_date_client)->copy();
 
         for ($x=0; $x<$iterations; $x++) {
             // we don't add the days... we calc the day of the month!!

app/PaymentDrivers/GoCardlessPaymentDriver.php

@@ -245,7 +245,7 @@ class GoCardlessPaymentDriver extends BaseDriver
         sleep(1);
 
         foreach ($request->events as $event) {
-            if ($event['action'] === 'confirmed' || $event['action'] === 'paid_out') {
+            if ($event['action'] === 'confirmed' || $event['action'] === 'paid_out' || $event['action'] === 'paid') {
 
                 nlog("Searching for transaction reference");
                 

app/Services/Recurring/RecurringService.php

@@ -106,6 +106,12 @@ class RecurringService
             $this->stop();
         }
         
+        if(isset($this->recurring_entity->client))
+        {
+            $offset = $this->recurring_entity->client->timezone_offset();
+            $this->recurring_entity->next_send_date = Carbon::parse($this->recurring_entity->next_send_date_client)->startOfDay()->addSeconds($offset);
+        }
+
         return $this;
     }
 

app/Transformers/RecurringExpenseTransformer.php

@@ -100,7 +100,8 @@ class RecurringExpenseTransformer extends EntityTransformer
             'frequency_id' => (string) $recurring_expense->frequency_id,
             'remaining_cycles' => (int) $recurring_expense->remaining_cycles,
             'last_sent_date' => $recurring_expense->last_sent_date ?: '',
-            'next_send_date' => $recurring_expense->next_send_date ?: '',
+            // 'next_send_date' => $recurring_expense->next_send_date ?: '',
+            'next_send_date' => $recurring_expense->next_send_date_client ?: '',
             'recurring_dates' => (array) [],
         ];
 

app/Transformers/RecurringInvoiceTransformer.php

@@ -95,7 +95,8 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'po_number' => $invoice->po_number ?: '',
             'date' => $invoice->date ?: '',
             'last_sent_date' => $invoice->last_sent_date ?: '',
-            'next_send_date' => $invoice->next_send_date ?: '',
+            // 'next_send_date' => $invoice->next_send_date ?: '',
+            'next_send_date' => $invoice->next_send_date_client ?: '',  
             'due_date' => $invoice->due_date ?: '',
             'terms' => $invoice->terms ?: '',
             'public_notes' => $invoice->public_notes ?: '',

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.93',
+    'app_version' => '5.3.94',
-    'app_tag' => '5.3.93',
+    'app_tag' => '5.3.94',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

database/factories/RecurringInvoiceFactory.php

@@ -51,6 +51,7 @@ class RecurringInvoiceFactory extends Factory
             'frequency_id' => RecurringInvoice::FREQUENCY_MONTHLY,
             'last_sent_date' => now()->subMonth(),
             'next_send_date' => now()->addMonthNoOverflow(),
+            'next_send_date_client' => now()->addMonthNoOverflow(),
             'remaining_cycles' => $this->faker->numberBetween(1, 10),
             'amount' => $this->faker->randomFloat(2, $min = 1, $max = 1000), // 48.8932
 

database/migrations/2022_05_28_234651_create_purchase_orders_table.php

@@ -122,6 +122,5 @@ class CreatePurchaseOrdersTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('purchase_orders');
     }
 }

database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php

@@ -35,8 +35,6 @@ class AddJobRelatedFieldsToSchedulersTable extends Migration
      */
     public function down()
     {
-        Schema::table('schedulers', function (Blueprint $table) {
+
-            //
-        });
     }
 }

database/migrations/2022_06_01_215859_set_recurring_client_timestamp.php

@@ -0,0 +1,52 @@
+<?php
+
+use App\Models\RecurringExpense;
+use App\Models\RecurringInvoice;
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SetRecurringClientTimestamp extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     */
+    public function up()
+    {
+        Schema::table('recurring_invoices', function (Blueprint $table) {
+            $table->datetime('next_send_date_client')->nullable();
+        });
+
+        Schema::table('recurring_expenses', function (Blueprint $table) {
+            $table->datetime('next_send_date_client')->nullable();
+        });
+
+
+        RecurringInvoice::whereNotNull('next_send_date')->cursor()->each(function ($recurring_invoice){
+
+            // $offset = $recurring_invoice->client->timezone_offset();
+            // $re = Carbon::parse($recurring_invoice->next_send_date)->subSeconds($offset)->format('Y-m-d');
+            $re = Carbon::parse($recurring_invoice->next_send_date)->format('Y-m-d');
+            $recurring_invoice->next_send_date_client = $re;
+            $recurring_invoice->saveQuietly();
+
+        });
+    
+        RecurringExpense::whereNotNull('next_send_date')->cursor()->each(function ($recurring_expense){
+            $recurring_expense->next_send_date_client = $recurring_expense->next_send_date;
+            $recurring_expense->saveQuietly();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

tests/Feature/RecurringInvoiceTest.php

@@ -50,6 +50,46 @@ class RecurringInvoiceTest extends TestCase
         $this->makeTestData();
     }
 
+    public function testTimezoneNextSendDateCalculations()
+    {
+
+        $settings = $this->company->settings;
+        $settings->timezone_id = '112';
+        $this->company->settings = $settings;
+        $this->company->save();
+
+        $data = [
+            'frequency_id' => 1,
+            'status_id' => 1,
+            'discount' => 0,
+            'is_amount_discount' => 1,
+            'po_number' => '3434343',
+            'public_notes' => 'notes',
+            'next_send_date' => now()->addDay()->format('Y-m-d'),
+            'is_deleted' => 0,
+            'custom_value1' => 0,
+            'custom_value2' => 0,
+            'custom_value3' => 0,
+            'custom_value4' => 0,
+            'status' => 1,
+            'client_id' => $this->encodePrimaryKey($this->client->id),
+            'line_items' => $this->buildLineItems(),
+            'remaining_cycles' => -1,
+        ];
+
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/recurring_invoices?start=true', $data)
+            ->assertStatus(200);
+
+            $arr = $response->json();
+
+            $this->assertEquals(RecurringInvoice::STATUS_ACTIVE, $arr['data']['status_id']);
+
+            $this->assertEquals(now()->addDay()->format('Y-m-d'), $arr['data']['next_send_date']);
+    }
+
     public function testPostRecurringInvoice()
     {
         $data = [