diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 3383afddf9d3..e663b3e86968 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -370,7 +370,7 @@ class CompanyExport implements ShouldQueue })->makeHidden(['id'])->toArray(); - $this->export_data['users'] = $this->company->users->map(function ($user){ + $this->export_data['users'] = $this->company->users()->withTrashed()->cursor()->map(function ($user){ $user->account_id = $this->encodePrimaryKey($user->account_id); $user->id = $this->encodePrimaryKey($user->id); diff --git a/app/Transformers/SubscriptionTransformer.php b/app/Transformers/SubscriptionTransformer.php index 52bf5a5e7632..5b49a516960c 100644 --- a/app/Transformers/SubscriptionTransformer.php +++ b/app/Transformers/SubscriptionTransformer.php @@ -60,7 +60,7 @@ class SubscriptionTransformer extends EntityTransformer 'allow_plan_changes' => (bool)$subscription->allow_plan_changes, 'refund_period' => (int)$subscription->refund_period, 'webhook_configuration' => $subscription->webhook_configuration ?: [], - 'purchase_page' => (string)$company->domain() . "/client/subscription/{$subscription->hashed_id}/purchase", + 'purchase_page' => (string)$company->domain() . "/client/subscriptions/{$subscription->hashed_id}/purchase", //'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id), 'currency_id' => (string) $subscription->currency_id, 'is_deleted' => (bool)$subscription->is_deleted, diff --git a/routes/client.php b/routes/client.php index 759bd5580e84..9e6d921cc606 100644 --- a/routes/client.php +++ b/routes/client.php @@ -80,7 +80,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence Route::get('logout', 'Auth\ContactLoginController@logout')->name('logout'); }); -Route::get('client/subscription/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db'); +Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db'); Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { /*Invitation catches*/ diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php index 16a7621caa4c..f884a3a89898 100644 --- a/tests/Feature/Import/ImportCompanyTest.php +++ b/tests/Feature/Import/ImportCompanyTest.php @@ -16,6 +16,7 @@ use App\Models\Expense; use App\Models\Invoice; use App\Models\Payment; use App\Models\Product; +use App\Models\User; use App\Models\Vendor; use App\Utils\Traits\MakesHash; use Illuminate\Routing\Middleware\ThrottleRequests; @@ -63,23 +64,28 @@ class ImportCompanyTest extends TestCase $this->assertTrue(property_exists($backup_json_file, 'app_version')); $this->assertTrue(property_exists($backup_json_file, 'users')); - // User::unguard(); + User::unguard(); - // foreach ($this->backup_file->users as $user) - // { + foreach ($backup_json_file->users as $user) + { - // $new_user = User::firstOrNew( - // ['email' => $user->email], - // (array)$user, - // ); + $new_user = User::firstOrNew( + ['email' => $user->email], + (array)$user, + ); - // $new_user->account_id = $this->account->id; - // $new_user->save(['timestamps' => false]); + $new_user->account_id = $this->account->id; + $new_user->save(['timestamps' => false]); - // $this->ids['users']["{$user->id}"] = $new_user->id; - // } +nlog($new_user->toArray()); - // User::reguard(); + $this->ids['users']["{$user->id}"] = $new_user->id; + +nlog($this->ids); + + } + + User::reguard(); } diff --git a/tests/Feature/Import/backup.json b/tests/Feature/Import/backup.json index a49c25849b4b..1579c84dbfd5 100644 --- a/tests/Feature/Import/backup.json +++ b/tests/Feature/Import/backup.json @@ -1 +1 @@ -{"app_version":"5.1.62","activities":[{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"VWPe9OYbLy","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":5,"ip":"","is_system":false,"notes":"","created_at":1620971761,"updated_at":1620971761,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"VWPe9OYbLy","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":4,"ip":"","is_system":false,"notes":"","created_at":1620971762,"updated_at":1620971762,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"QnXe0O3dxr","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":5,"ip":"","is_system":false,"notes":"","created_at":1620971762,"updated_at":1620971762,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"QnXe0O3dxr","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":4,"ip":"","is_system":false,"notes":"","created_at":1620971763,"updated_at":1620971763,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"Wjneg6DdwZ","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":5,"ip":"","is_system":false,"notes":"","created_at":1620971763,"updated_at":1620971763,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"Wjneg6DdwZ","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":4,"ip":"","is_system":false,"notes":"","created_at":1620971764,"updated_at":1620971764,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"VolejLBbjN","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":5,"ip":"","is_system":false,"notes":"","created_at":1620971764,"updated_at":1620971764,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"VolejLBbjN","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":4,"ip":"","is_system":false,"notes":"","created_at":1620971765,"updated_at":1620971765,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"WpmbkDKdzJ","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":5,"ip":"","is_system":false,"notes":"","created_at":1620971765,"updated_at":1620971765,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"VWPe9xdLyw","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"WpmbkDKdzJ","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":4,"ip":"","is_system":false,"notes":"","created_at":1620971766,"updated_at":1620971766,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""},{"user_id":"WJxbojagwO","company_id":"gl9avmeG1v","client_id":"","client_contact_id":"","account_id":"","project_id":"","vendor_id":"","payment_id":"","invoice_id":"","credit_id":"","invitation_id":"","task_id":"","expense_id":"","activity_type_id":49,"ip":"","is_system":false,"notes":"Noe Reynolds Beatrice Reichel Updated user Noe Reynolds Beatrice Reichel","created_at":1620971766,"updated_at":1620971766,"token_id":"","quote_id":"","subscription_id":"","recurring_invoice_id":""}],"backups":[{"id":68,"activity_id":"kQBeXqoayK","json_backup":"","html_backup":"\n