Merge pull request #7696 from turbo124/v5-stable

v5.4.4

VERSION.txt

@@ -1 +1 @@
-5.5.3
+5.5.4

app/Http/Controllers/Auth/ContactLoginController.php

@@ -46,6 +46,10 @@ class ContactLoginController extends Controller
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->input('company_key'))->first();
         }
+        elseif($request->has('company_key')){
+             MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
+            $company = Company::where('company_key', $request->input('company_key'))->first();
+        }
 
         if ($company) {
             $account = $company->account;

app/Transformers/CompanyTransformer.php

@@ -177,7 +177,7 @@ class CompanyTransformer extends EntityTransformer
             'inventory_notification_threshold' => (int) $company->inventory_notification_threshold,
             'track_inventory' => (bool) $company->track_inventory,
             'enable_applying_payments' => (bool) $company->enable_applying_payments,
-            'enabled_expense_tax_rates' => (bool) $company->enabled_expense_tax_rates,
+            'enabled_expense_tax_rates' => (int) $company->enabled_expense_tax_rates,
         ];
     }
 

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.5.3',
-    'app_tag' => '5.5.3',
+    'app_version' => '5.5.4',
+    'app_tag' => '5.5.4',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

database/migrations/2022_07_29_091235_correction_for_companies_table_types.php

@@ -0,0 +1,38 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->unsignedInteger('enabled_expense_tax_rates')->default(0)->change();
+        });
+
+        Company::query()->where('enabled_item_tax_rates', true)->cursor()->each(function ($company){
+            
+            $company->enabled_expense_tax_rates = $company->enabled_item_tax_rates;
+            $company->save();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};

routes/api.php

@@ -104,7 +104,7 @@ Route::group(['middleware' => ['throttle:10,1','api_secret_check','email_db']],
     Route::post('api/v1/reset_password', [ForgotPasswordController::class, 'sendResetLinkEmail']);
 });
 
-Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
+Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
     Route::put('accounts/{account}', [AccountController::class, 'update'])->name('account.update');
     Route::post('check_subdomain', [SubdomainController::class, 'index'])->name('check_subdomain');
     Route::get('ping', [PingController::class, 'index'])->name('ping');
@@ -239,7 +239,7 @@ Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale
     Route::post('recurring_quotes/bulk', [RecurringQuoteController::class, 'bulk'])->name('recurring_quotes.bulk');
     Route::put('recurring_quotes/{recurring_quote}/upload', [RecurringQuoteController::class, 'upload']);
 
-    Route::post('refresh', [LoginController::class, 'refresh'])->middleware('throttle:300,3');
+    Route::post('refresh', [LoginController::class, 'refresh'])->middleware('throttle:300,2');
 
     Route::post('reports/clients', ClientReportController::class);
     Route::post('reports/contacts', ClientContactReportController::class);
@@ -287,7 +287,7 @@ Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale
     Route::post('settings/disable_two_factor', [TwoFactorController::class, 'disableTwoFactor']);
 
 
-    Route::post('verify', [TwilioController::class, 'generate'])->name('verify.generate');
+    Route::post('verify', [TwilioController::class, 'generate'])->name('verify.generate')->middleware('throttle:5,1');
     Route::post('verify/confirm', [TwilioController::class, 'confirm'])->name('verify.confirm');
     
     Route::resource('vendors', VendorController::class); // name = (vendors. index / create / show / update / destroy / edit

routes/client.php

@@ -18,8 +18,8 @@ use Illuminate\Support\Facades\Route;
 
 Route::get('client', [ContactLoginController::class, 'showLoginForm'])->name('client.catchall')->middleware(['domain_db', 'contact_account','locale']); //catch all
 
-Route::get('client/login', [ContactLoginController::class, 'showLoginForm'])->name('client.login')->middleware(['domain_db', 'contact_account','locale']);
-Route::post('client/login', [ContactLoginController::class, 'login'])->name('client.login.submit');
+Route::get('client/login/{company_key?}', [ContactLoginController::class, 'showLoginForm'])->name('client.login')->middleware(['domain_db', 'contact_account','locale']);
+Route::post('client/login/{company_key?}', [ContactLoginController::class, 'login'])->name('client.login.submit');
 
 Route::get('client/register/{company_key?}', [ContactRegisterController::class, 'showRegisterForm'])->name('client.register')->middleware(['domain_db', 'contact_account', 'contact_register','locale']);
 Route::post('client/register/{company_key?}', [ContactRegisterController::class, 'register'])->middleware(['domain_db', 'contact_account', 'contact_register', 'locale', 'throttle:10,1']);