From d9d042724e006e1995c64432a685463bb3d430a8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 8 Apr 2021 20:38:31 +1000 Subject: [PATCH 1/3] Add daily reset --- app/Services/Subscription/SubscriptionService.php | 5 +++++ app/Utils/Traits/GeneratesCounter.php | 3 +++ 2 files changed, 8 insertions(+) diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index dfcb3a9b3014..6e4ce1ed96dc 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -182,6 +182,11 @@ class SubscriptionService } + public function createChangePlanInvoice($data) + { + + } + public function createInvoice($data): ?\App\Models\Invoice { diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index aca8acbfe1f8..caaa448842d4 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -426,6 +426,9 @@ trait GeneratesCounter } switch ($client->company->reset_counter_frequency_id) { + case RecurringInvoice::FREQUENCY_DAILY: + $reset_date->addDay(); + break; case RecurringInvoice::FREQUENCY_WEEKLY: $reset_date->addWeek(); break; From 47113da4fa1d9971b984a4dd52adb829cd0b6e6e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 8 Apr 2021 20:50:53 +1000 Subject: [PATCH 2/3] Fixes for invoice properties --- app/Http/Requests/Invoice/StoreInvoiceRequest.php | 2 +- .../UpdateRecurringInvoiceRequest.php | 4 +++- app/Models/Credit.php | 8 ++++---- app/Models/Invoice.php | 12 ++++-------- app/Models/Quote.php | 8 ++++---- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index 2da8e72603a6..28ca431c9e31 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -63,7 +63,7 @@ class StoreInvoiceRequest extends Request protected function prepareForValidation() { $input = $this->all(); - +nlog($input); $input = $this->decodePrimaryKeys($input); $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index 7156974c233c..84994bc99542 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -97,7 +97,9 @@ class UpdateRecurringInvoiceRequest extends Request } } - $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; + if (isset($input['line_items'])) { + $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; + } if (isset($input['auto_bill'])) { $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']); diff --git a/app/Models/Credit.php b/app/Models/Credit.php index b6c67eeb1bc7..aca29955edbb 100644 --- a/app/Models/Credit.php +++ b/app/Models/Credit.php @@ -70,10 +70,10 @@ class Credit extends BaseModel 'custom_surcharge2', 'custom_surcharge3', 'custom_surcharge4', - 'custom_surcharge_tax1', - 'custom_surcharge_tax2', - 'custom_surcharge_tax3', - 'custom_surcharge_tax4', + // 'custom_surcharge_tax1', + // 'custom_surcharge_tax2', + // 'custom_surcharge_tax3', + // 'custom_surcharge_tax4', 'design_id', 'assigned_user_id', 'exchange_rate', diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 48342fd68aa8..177137e13409 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -84,10 +84,10 @@ class Invoice extends BaseModel 'custom_surcharge2', 'custom_surcharge3', 'custom_surcharge4', - 'custom_surcharge_tax1', - 'custom_surcharge_tax2', - 'custom_surcharge_tax3', - 'custom_surcharge_tax4', + // 'custom_surcharge_tax1', + // 'custom_surcharge_tax2', + // 'custom_surcharge_tax3', + // 'custom_surcharge_tax4', 'design_id', 'assigned_user_id', 'exchange_rate', @@ -103,10 +103,6 @@ class Invoice extends BaseModel 'updated_at' => 'timestamp', 'created_at' => 'timestamp', 'deleted_at' => 'timestamp', - 'custom_surcharge_tax1' => 'bool', - 'custom_surcharge_tax2' => 'bool', - 'custom_surcharge_tax3' => 'bool', - 'custom_surcharge_tax4' => 'bool', ]; protected $with = []; diff --git a/app/Models/Quote.php b/app/Models/Quote.php index 23992250887e..aa9720a505a5 100644 --- a/app/Models/Quote.php +++ b/app/Models/Quote.php @@ -71,10 +71,10 @@ class Quote extends BaseModel 'custom_surcharge2', 'custom_surcharge3', 'custom_surcharge4', - 'custom_surcharge_tax1', - 'custom_surcharge_tax2', - 'custom_surcharge_tax3', - 'custom_surcharge_tax4', + // 'custom_surcharge_tax1', + // 'custom_surcharge_tax2', + // 'custom_surcharge_tax3', + // 'custom_surcharge_tax4', 'design_id', 'assigned_user_id', 'exchange_rate', From 8e327d3a75506f36e3dc22010dc449349f8d2ca4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 8 Apr 2021 21:08:29 +1000 Subject: [PATCH 3/3] v5.1.41 --- VERSION.txt | 2 +- app/Http/Requests/Client/StoreClientRequest.php | 2 +- app/Http/Requests/Invoice/StoreInvoiceRequest.php | 2 +- config/ninja.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 8211d6fb9895..db6211c40693 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.40 \ No newline at end of file +5.1.41 \ No newline at end of file diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php index 432ad1fe61d7..ac5767eb8156 100644 --- a/app/Http/Requests/Client/StoreClientRequest.php +++ b/app/Http/Requests/Client/StoreClientRequest.php @@ -81,7 +81,7 @@ class StoreClientRequest extends Request { $input = $this->all(); - //@todo implement feature permissions for > 100 clients + //@todo implement feature permissions for > 50 clients $settings = ClientSettings::defaults(); diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index 28ca431c9e31..2da8e72603a6 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -63,7 +63,7 @@ class StoreInvoiceRequest extends Request protected function prepareForValidation() { $input = $this->all(); -nlog($input); + $input = $this->decodePrimaryKeys($input); $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; diff --git a/config/ninja.php b/config/ninja.php index f3702aad3497..683b30f25629 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,7 +14,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.40', + 'app_version' => '5.1.41', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),