diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 9a75a872f34b..467a91de016f 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -268,8 +268,11 @@ class LoginController extends BaseController $user = $oauth->getProvider(request()->input('provider'))->getTokenResponse(request()->input('token')); - if ($user) - return $this->itemResponse($user); + if ($user) { + $ct = CompanyUser::whereUserId($user); + return $this->listResponse($ct); + // return $this->itemResponse($user); + } else return $this->errorResponse(['message' => 'Invalid credentials'], 401); diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php index 0a22797b82c2..00eacb07ff56 100644 --- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php +++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php @@ -25,7 +25,7 @@ class PaymentMethodController extends Controller */ public function index() { - + echo 'list of payment methods here'; } /** @@ -53,7 +53,6 @@ class PaymentMethodController extends Controller */ public function store(Request $request) { - $gateway = auth()->user()->client->getCreditCardGateway(); return $gateway->driver(auth()->user()->client)->authorizeCreditCardResponse($request); diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 47d43ded920e..537e9a1bd464 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -24,9 +24,11 @@ use App\Jobs\Company\CreateCompanyToken; use App\Jobs\RegisterNewAccount; use App\Models\Account; use App\Models\Company; +use App\Models\CompanyUser; use App\Repositories\CompanyRepository; use App\Transformers\AccountTransformer; use App\Transformers\CompanyTransformer; +use App\Transformers\CompanyUserTransformer; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; @@ -122,10 +124,13 @@ class CompanyController extends BaseController //todo Need to discuss this with Hillel which is the best representation to return //when a company is created. Do we send the entire account? Do we only send back the created CompanyUser? - $this->entity_transformer = CompanyTransformer::class; - $this->entity_type = Company::class; + $this->entity_transformer = CompanyUserTransformer::class; + $this->entity_type = CompanyUser::class; - return $this->itemResponse($company); + //return $this->itemResponse($company); + $ct = CompanyUser::whereUserId(auth()->user()->id); + + return $this->listResponse($ct); } diff --git a/app/Models/Client.php b/app/Models/Client.php index 6e7d970f4438..ef252738d670 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -43,7 +43,6 @@ class Client extends BaseModel protected $presenter = 'App\Models\Presenters\ClientPresenter'; - protected $hidden = [ 'id', 'private_notes', diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index 84120bb1f9ce..f1c068ab984c 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -11,6 +11,7 @@ namespace App\PaymentDrivers; +use App\Models\ClientGatewayToken; use App\Models\GatewayType; use Stripe\PaymentIntent; use Stripe\SetupIntent; @@ -132,71 +133,43 @@ class StripePaymentDriver extends BasePaymentDriver public function authorizeCreditCardResponse($request) { - /** - * { - "id": "seti_1FJHmuKmol8YQE9DdhDgFXhT", - "object": "setup_intent", - "cancellation_reason": null, - "client_secret": "seti_1FJHmuKmol8YQE9DdhDgFXhT_secret_FoveetSB7RewVngU7H6IcrH9dlM1BXd", - "created": 1568631032, - "description": null, - "last_setup_error": null, - "livemode": false, - "next_action": null, - "payment_method": "pm_1FJHvQKmol8YQE9DV19fPXXk", - "payment_method_types": [ - "card" - ], - "status": "succeeded", - "usage": "off_session" - - } + \Log::error($request->all()); + + $server_response = json_decode($request->input('gateway_response')); -\Stripe\Stripe::setApiKey('sk_test_faU9gVB7Hx19fCTo0e5ggZ0x'); + $gateway_id = $request->input('gateway_id'); + $gateway_type_id = $request->input('payment_method_id'); + $is_default = $request->input('is_default') ?: 0; -\Stripe\PaymentMethod::retrieve('pm_1EUmzw2xToAoV8choYUtciXR'); + $payment_method = $server_response->payment_method; + + $this->init(); + + $customer = $this->findOrCreateCustomer(); + + $stripe_payment_method = \Stripe\PaymentMethod::retrieve($payment_method); + $stripe_payment_method->attach(['customer' => $customer->id]); + + $cgt = new ClientGatewayToken; + $cgt->company_id = $this->client->company->id; + $cgt->client_id = $this->client->id; + $cgt->token = $payment_method; + $cgt->company_gateway_id = $this->company_gateway->id; + $cgt->payment_method_id = $gateway_type_id; + $cgt->gateway_customer_reference = $customer->id; + $cgt->save(); -{ - "id": "pm_1EUmzw2xToAoV8choYUtciXR", - "object": "payment_method", - "card": { - "brand": "visa", - "checks": { - "address_line1_check": null, - "address_postal_code_check": null, - "cvc_check": null - }, - "country": "US", - "exp_month": 8, - "exp_year": 2020, - "fingerprint": "sStRRZt3Xlw0Ec6B", - "funding": "credit", - "generated_from": null, - "last4": "4242", - "three_d_secure_usage": { - "supported": true - }, - "wallet": null - }, - "created": 1556596276, - "customer": "cus_3fAHf0I56s1QFx", - "livemode": false, - "metadata": {}, - "type": "card" -} - - */ - - - //get the customer or create a new one. - //get the payment method - //attached payment method to customer - //store meta data - + if($is_default) + { + $this->client->gateway_tokens->update(['is_default'=>0]); + $cgt->is_default = 1; + $cgt->save(); + } + return redirect()->route('client.payment_methods.index'); } /** @@ -233,9 +206,9 @@ class StripePaymentDriver extends BasePaymentDriver $this->init(); - $client_gateway_token = $this->client->gateway_tokens->whereGatewayId($this->company_gateway->gateway_id)->first(); + $client_gateway_token = $this->client->gateway_tokens()->whereCompanyGatewayId($this->company_gateway->gateway_id)->first(); - if($client_gateway_token->gateway_customer_reference) + if($client_gateway_token && $client_gateway_token->gateway_customer_reference) $customer = \Stripe\Customer::retrieve($client_gateway_token->gateway_customer_reference); else{ $customer = \Stripe\Customer::create([ @@ -244,6 +217,7 @@ class StripePaymentDriver extends BasePaymentDriver "phone" => $this->client->present()->phone(), ]); } + return $customer; } diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php index ff76ffe43b38..e2cb6928a524 100644 --- a/database/migrations/2014_10_13_000000_create_users_table.php +++ b/database/migrations/2014_10_13_000000_create_users_table.php @@ -16,8 +16,8 @@ class CreateUsersTable extends Migration Schema::create('languages', function ($table) { $table->increments('id'); - $table->string('name'); - $table->string('locale'); + $table->string('name')->default(''); + $table->string('locale')->default(''); }); Schema::create('countries', function ($table) { @@ -43,43 +43,43 @@ class CreateUsersTable extends Migration Schema::create('payment_types', function ($table) { $table->increments('id'); - $table->string('name'); - $table->integer('gateway_type_id'); + $table->string('name')->default(''); + $table->integer('gateway_type_id')->nullable(); }); Schema::create('timezones', function ($table) { $table->increments('id'); - $table->string('name'); - $table->string('location'); - $table->integer('utc_offset'); + $table->string('name')->default(''); + $table->string('location')->default(''); + $table->integer('utc_offset')->default(0); }); Schema::create('currencies', function ($table) { $table->increments('id'); - $table->string('name'); - $table->string('symbol'); - $table->string('precision'); - $table->string('thousand_separator'); - $table->string('decimal_separator'); - $table->string('code'); + $table->string('name')->default(''); + $table->string('symbol')->default(''); + $table->string('precision')->default(''); + $table->string('thousand_separator')->default(''); + $table->string('decimal_separator')->default(''); + $table->string('code')->default(''); $table->boolean('swap_currency_symbol')->default(false); }); Schema::create('sizes', function ($table) { $table->increments('id'); - $table->string('name'); + $table->string('name')->default(''); }); Schema::create('industries', function ($table) { $table->increments('id'); - $table->string('name'); + $table->string('name')->default(''); }); Schema::create('gateways', function ($table) { $table->increments('id'); - $table->string('name'); - $table->string('provider'); + $table->string('name')->default(''); + $table->string('provider')->default(''); $table->boolean('visible')->default(true); $table->timestamps(); }); @@ -126,24 +126,24 @@ class CreateUsersTable extends Migration Schema::create('companies', function (Blueprint $table) { $table->increments('id'); - $table->string('name')->nullable(); + $table->string('name')->nullable()->default(''); $table->unsignedInteger('account_id')->index(); $table->unsignedInteger('industry_id')->nullable(); - $table->string('ip'); + $table->string('ip')->default(''); $table->string('company_key',100)->unique(); - $table->string('logo')->nullable(); - $table->string('address1')->nullable(); - $table->string('address2')->nullable(); - $table->string('city')->nullable(); - $table->string('state')->nullable(); - $table->string('postal_code')->nullable(); - $table->string('work_phone')->nullable(); - $table->string('work_email')->nullable(); + $table->string('logo')->default(''); + $table->string('address1')->default(''); + $table->string('address2')->default(''); + $table->string('city')->default(''); + $table->string('state')->default(''); + $table->string('postal_code')->default(''); + $table->string('work_phone')->default(''); + $table->string('work_email')->default(''); $table->unsignedInteger('country_id')->nullable(); - $table->string('domain')->nullable(); - $table->string('db')->nullable(); - $table->string('vat_number')->nullable(); - $table->string('id_number')->nullable(); + $table->string('domain')->default(''); + $table->string('db')->default(''); + $table->string('vat_number')->default(''); + $table->string('id_number')->default(''); $table->unsignedInteger('size_id')->nullable(); $table->text('settings'); @@ -165,10 +165,10 @@ class CreateUsersTable extends Migration $table->unsignedInteger('company_id'); $table->unsignedInteger('account_id'); $table->unsignedInteger('user_id')->index(); - $table->text('permissions'); - $table->text('settings'); + $table->text('permissions')->default(''); + $table->text('settings')->default(''); $table->boolean('is_owner')->default(false); - $table->boolean('is_admin'); + $table->boolean('is_admin')->default(false); $table->boolean('is_locked')->default(false); // locks user out of account $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); @@ -182,12 +182,12 @@ class CreateUsersTable extends Migration $table->increments('id'); $table->unsignedInteger('user_id'); $table->unsignedInteger('company_id')->index(); - $table->string('path'); - $table->string('preview'); - $table->string('name'); - $table->string('type'); - $table->string('disk'); - $table->string('hash', 100); + $table->string('path')->default(''); + $table->string('preview')->default(''); + $table->string('name')->default(''); + $table->string('type')->default(''); + $table->string('disk')->default(''); + $table->string('hash', 100)->default(''); $table->unsignedInteger('size')->nullable(); $table->unsignedInteger('width')->nullable(); $table->unsignedInteger('height')->nullable(); @@ -204,26 +204,25 @@ class CreateUsersTable extends Migration Schema::create('users', function (Blueprint $table) { $table->increments('id'); - //$table->unsignedInteger('account_id')->index(); - $table->string('first_name')->nullable(); - $table->string('last_name')->nullable(); - $table->string('phone')->nullable(); + $table->string('first_name')->default(''); + $table->string('last_name')->default(''); + $table->string('phone')->default(''); $table->string('email',100)->unique(); $table->timestamp('email_verified_at')->nullable(); - $table->string('confirmation_code')->nullable(); + $table->string('confirmation_code')->default(''); $table->integer('theme_id')->nullable(); $table->smallInteger('failed_logins')->nullable(); - $table->string('referral_code')->nullable(); - $table->string('oauth_user_id',100)->nullable(); - $table->string('oauth_provider_id')->nullable(); - $table->string('google_2fa_secret')->nullable(); - $table->string('accepted_terms_version')->nullable(); + $table->string('referral_code')->default(''); + $table->string('oauth_user_id',100)->default(''); + $table->string('oauth_provider_id')->default(''); + $table->string('google_2fa_secret')->default(''); + $table->string('accepted_terms_version')->default(''); $table->string('avatar', 100)->default(''); $table->unsignedInteger('avatar_width')->nullable(); $table->unsignedInteger('avatar_height')->nullable(); $table->unsignedInteger('avatar_size')->nullable(); $table->timestamp('last_login')->nullable(); - $table->text('signature'); + $table->text('signature')->default(''); $table->string('password'); $table->rememberToken(); @@ -244,7 +243,7 @@ class CreateUsersTable extends Migration $table->unsignedInteger('account_id'); $table->unsignedInteger('user_id')->index(); $table->string('token')->nullable(); - $table->string('name')->nullable(); + $table->string('name')->default(''); $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); @@ -257,43 +256,43 @@ class CreateUsersTable extends Migration $table->unsignedInteger('company_id')->index(); $table->unsignedInteger('user_id')->index(); - $table->string('name')->nullable(); - $table->string('website')->nullable(); - $table->text('private_notes')->nullable(); - $table->text('client_hash')->nullable(); - $table->string('logo', 255)->nullable(); + $table->string('name')->default(''); + $table->string('website')->default(''); + $table->text('private_notes')->default(''); + $table->text('client_hash')->default(''); + $table->string('logo', 255)->default(''); - $table->decimal('balance', 13, 2)->nullable(); - $table->decimal('paid_to_date', 13, 2)->nullable(); + $table->decimal('balance', 13, 2)->default(0); + $table->decimal('paid_to_date', 13, 2)->default(0); $table->timestamp('last_login')->nullable(); $table->unsignedInteger('industry_id')->nullable(); $table->unsignedInteger('size_id')->nullable(); $table->unsignedInteger('currency_id')->nullable(); - $table->string('address1')->nullable(); - $table->string('address2')->nullable(); - $table->string('city')->nullable(); - $table->string('state')->nullable(); - $table->string('postal_code')->nullable(); + $table->string('address1')->default(''); + $table->string('address2')->default(''); + $table->string('city')->default(''); + $table->string('state')->default(''); + $table->string('postal_code')->default(''); $table->unsignedInteger('country_id')->nullable(); - $table->string('custom_value1')->nullable(); - $table->string('custom_value2')->nullable(); - $table->string('custom_value3')->nullable(); - $table->string('custom_value4')->nullable(); + $table->string('custom_value1')->default(''); + $table->string('custom_value2')->default(''); + $table->string('custom_value3')->default(''); + $table->string('custom_value4')->default(''); - $table->string('shipping_address1')->nullable(); - $table->string('shipping_address2')->nullable(); - $table->string('shipping_city')->nullable(); - $table->string('shipping_state')->nullable(); - $table->string('shipping_postal_code')->nullable(); + $table->string('shipping_address1')->default(''); + $table->string('shipping_address2')->default(''); + $table->string('shipping_city')->default(''); + $table->string('shipping_state')->default(''); + $table->string('shipping_postal_code')->default(''); $table->unsignedInteger('shipping_country_id')->nullable(); - $table->text('settings'); + $table->text('settings')->default(''); $table->boolean('is_deleted')->default(false); $table->integer('payment_terms')->nullable(); $table->unsignedInteger('group_settings_id')->nullable(); - $table->string('vat_number')->nullable(); - $table->string('id_number')->nullable(); + $table->string('vat_number')->default(''); + $table->string('id_number')->default(''); $table->timestamps(6); $table->softDeletes(); @@ -310,14 +309,14 @@ class CreateUsersTable extends Migration $table->unsignedInteger('company_id')->index(); $table->unsignedInteger('client_id')->index(); $table->unsignedInteger('user_id')->index(); - $table->string('first_name')->nullable(); - $table->string('last_name')->nullable(); - $table->string('phone')->nullable(); - $table->string('custom_value1')->nullable(); - $table->string('custom_value2')->nullable(); - $table->string('custom_value3')->nullable(); - $table->string('custom_value4')->nullable(); - $table->string('email',100); + $table->string('first_name')->default(''); + $table->string('last_name')->default(''); + $table->string('phone')->default(''); + $table->string('custom_value1')->default(''); + $table->string('custom_value2')->default(''); + $table->string('custom_value3')->default(''); + $table->string('custom_value4')->default(''); + $table->string('email',100)->default(''); $table->timestamp('email_verified_at')->nullable(); $table->string('confirmation_code')->nullable(); $table->boolean('is_primary')->default(false); @@ -327,10 +326,10 @@ class CreateUsersTable extends Migration $table->string('oauth_user_id',100)->nullable()->unique(); $table->unsignedInteger('oauth_provider_id')->nullable()->unique(); $table->string('google_2fa_secret')->nullable(); - $table->string('accepted_terms_version')->nullable(); - $table->string('avatar', 255)->nullable(); - $table->string('avatar_type',255)->nullable(); - $table->string('avatar_size',255)->nullable(); + $table->string('accepted_terms_version')->default(''); + $table->string('avatar', 255)->default(''); + $table->string('avatar_type',255)->default(''); + $table->string('avatar_size',255)->default(''); $table->string('password'); $table->string('token')->nullable(); $table->boolean('is_locked')->default(false); @@ -390,36 +389,36 @@ class CreateUsersTable extends Migration $t->unsignedInteger('recurring_invoice_id')->nullable(); - $t->string('invoice_number')->nullable(); - $t->float('discount'); - $t->boolean('is_amount_discount'); + $t->string('invoice_number')->default(''); + $t->float('discount')->default(0); + $t->boolean('is_amount_discount')->default(0); - $t->string('po_number'); + $t->string('po_number')->default(''); $t->date('invoice_date')->nullable(); $t->datetime('due_date')->nullable(); $t->boolean('is_deleted')->default(false); - $t->text('line_items')->nullable(); - $t->text('settings')->nullable(); - $t->text('backup')->nullable(); + $t->text('line_items')->default(''); + $t->text('settings')->default(''); + $t->text('backup')->default(''); - $t->text('footer')->nullable(); - $t->text('public_notes')->nullable(); - $t->text('private_notes')->nullable(); - $t->text('terms')->nullable(); + $t->text('footer')->default(''); + $t->text('public_notes')->default(''); + $t->text('private_notes')->default(''); + $t->text('terms')->default(''); - $t->string('tax_name1'); - $t->decimal('tax_rate1', 13, 3); + $t->string('tax_name1')->default(''); + $t->decimal('tax_rate1', 13, 3)->default(0); - $t->string('tax_name2'); - $t->decimal('tax_rate2', 13, 3); + $t->string('tax_name2')->default(''); + $t->decimal('tax_rate2', 13, 3)->default(0); - $t->string('custom_value1')->nullable(); - $t->string('custom_value2')->nullable(); - $t->string('custom_value3')->nullable(); - $t->string('custom_value4')->nullable(); + $t->string('custom_value1')->default(''); + $t->string('custom_value2')->default(''); + $t->string('custom_value3')->default(''); + $t->string('custom_value4')->default(''); $t->decimal('amount', 13, 2); $t->decimal('balance', 13, 2); @@ -445,37 +444,37 @@ class CreateUsersTable extends Migration $t->unsignedInteger('company_id')->index(); $t->unsignedInteger('status_id')->index(); - $t->text('invoice_number')->nullable(); + $t->text('invoice_number')->default(''); - $t->float('discount'); - $t->boolean('is_amount_discount'); + $t->float('discount')->default(0); + $t->boolean('is_amount_discount')->default(false); - $t->string('po_number'); + $t->string('po_number')->default(''); $t->date('invoice_date')->nullable(); $t->datetime('due_date')->nullable(); $t->boolean('is_deleted')->default(false); - $t->text('line_items')->nullable(); - $t->text('settings')->nullable(); - $t->text('backup')->nullable(); + $t->text('line_items')->default(''); + $t->text('settings')->default(''); + $t->text('backup')->default(''); - $t->text('footer')->nullable(); - $t->text('public_notes')->nullable(); - $t->text('private_notes')->nullable(); - $t->text('terms')->nullable(); + $t->text('footer')->default(''); + $t->text('public_notes')->default(''); + $t->text('private_notes')->default(''); + $t->text('terms')->default(''); - $t->string('tax_name1'); - $t->decimal('tax_rate1', 13, 3); + $t->string('tax_name1')->default(''); + $t->decimal('tax_rate1', 13, 3)->default(0); - $t->string('tax_name2'); - $t->decimal('tax_rate2', 13, 3); + $t->string('tax_name2')->default(''); + $t->decimal('tax_rate2', 13, 3)->default(0); - $t->string('custom_value1')->nullable(); - $t->string('custom_value2')->nullable(); - $t->string('custom_value3')->nullable(); - $t->string('custom_value4')->nullable(); + $t->string('custom_value1')->default(''); + $t->string('custom_value2')->default(''); + $t->string('custom_value3')->default(''); + $t->string('custom_value4')->default(''); $t->decimal('amount', 13, 2); $t->decimal('balance', 13, 2); @@ -506,38 +505,38 @@ class CreateUsersTable extends Migration $t->unsignedInteger('status_id')->index(); - $t->float('discount'); - $t->boolean('is_amount_discount'); - $t->string('quote_number'); + $t->float('discount')->default(0); + $t->boolean('is_amount_discount')->default(false); + $t->string('quote_number')->default(''); - $t->string('po_number'); + $t->string('po_number')->default(''); $t->date('quote_date')->nullable(); $t->datetime('valid_until')->nullable(); $t->boolean('is_deleted')->default(false); - $t->text('line_items')->nullable(); - $t->text('settings')->nullable(); - $t->text('backup')->nullable(); + $t->text('line_items')->default(''); + $t->text('settings')->default(''); + $t->text('backup')->default(''); - $t->text('footer')->nullable(); - $t->text('public_notes')->nullable(); - $t->text('private_notes')->nullable(); - $t->text('terms')->nullable(); + $t->text('footer')->default(''); + $t->text('public_notes')->default(''); + $t->text('private_notes')->default(''); + $t->text('terms')->default(''); - $t->string('tax_name1'); - $t->decimal('tax_rate1', 13, 3); + $t->string('tax_name1')->default(''); + $t->decimal('tax_rate1', 13, 3)->default(0); - $t->string('tax_name2'); - $t->decimal('tax_rate2', 13, 3); + $t->string('tax_name2')->default(''); + $t->decimal('tax_rate2', 13, 3)->default(0); - $t->string('custom_value1')->nullable(); - $t->string('custom_value2')->nullable(); - $t->string('custom_value3')->nullable(); - $t->string('custom_value4')->nullable(); + $t->string('custom_value1')->default(''); + $t->string('custom_value2')->default(''); + $t->string('custom_value3')->default(''); + $t->string('custom_value4')->default(''); - $t->decimal('amount', 13, 2); - $t->decimal('balance', 13, 2); + $t->decimal('amount', 13, 2)->default(0); + $t->decimal('balance', 13, 2)->default(0); $t->datetime('last_viewed')->nullable(); @@ -563,39 +562,39 @@ class CreateUsersTable extends Migration $t->unsignedInteger('company_id')->index(); $t->unsignedInteger('status_id'); - $t->string('quote_number'); - $t->float('discount'); - $t->boolean('is_amount_discount'); + $t->string('quote_number')->default(''); + $t->float('discount')->default(0); + $t->boolean('is_amount_discount')->default(false); - $t->string('po_number'); + $t->string('po_number')->default(''); $t->date('quote_date')->nullable(); $t->datetime('valid_until')->nullable(); $t->boolean('is_deleted')->default(false); - $t->text('line_items')->nullable(); - $t->text('settings')->nullable(); - $t->text('backup')->nullable(); + $t->text('line_items')->default(''); + $t->text('settings')->default(''); + $t->text('backup')->default(''); - $t->text('footer')->nullable(); - $t->text('public_notes')->nullable(); - $t->text('private_notes')->nullable(); - $t->text('terms')->nullable(); + $t->text('footer')->default(''); + $t->text('public_notes')->default(''); + $t->text('private_notes')->default(''); + $t->text('terms')->default(''); - $t->string('tax_name1'); - $t->decimal('tax_rate1', 13, 3); + $t->string('tax_name1')->default(''); + $t->decimal('tax_rate1', 13, 3)->default(0); - $t->string('tax_name2'); - $t->decimal('tax_rate2', 13, 3); + $t->string('tax_name2')->default(''); + $t->decimal('tax_rate2', 13, 3)->default(0); - $t->string('custom_value1')->nullable(); - $t->string('custom_value2')->nullable(); - $t->string('custom_value3')->nullable(); - $t->string('custom_value4')->nullable(); + $t->string('custom_value1')->default(''); + $t->string('custom_value2')->default(''); + $t->string('custom_value3')->default(''); + $t->string('custom_value4')->default(''); - $t->decimal('amount', 13, 2); - $t->decimal('balance', 13, 2); + $t->decimal('amount', 13, 2)->default(0); + $t->decimal('balance', 13, 2)->default(0); $t->decimal('partial', 13, 2)->nullable(); $t->datetime('partial_due_date')->nullable(); @@ -621,10 +620,10 @@ class CreateUsersTable extends Migration $t->timestamps(6); $t->softDeletes(); - $t->string('transaction_reference')->nullable(); + $t->string('transaction_reference')->default(''); $t->string('message_id')->nullable(); - $t->text('email_error'); - $t->text('signature_base64'); + $t->text('email_error')->default(''); + $t->text('signature_base64')->default(''); $t->datetime('signature_date')->nullable(); $t->datetime('sent_date')->nullable(); @@ -650,7 +649,7 @@ class CreateUsersTable extends Migration $t->softDeletes(); $t->string('name',100)->unique(); - $t->decimal('rate', 13, 3); + $t->decimal('rate', 13, 3)->default(0); $t->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); @@ -663,21 +662,21 @@ class CreateUsersTable extends Migration $t->unsignedInteger('company_id')->index(); $t->unsignedInteger('user_id'); - $t->string('custom_value1')->nullable(); - $t->string('custom_value2')->nullable(); - $t->string('custom_value3')->nullable(); - $t->string('custom_value4')->nullable(); + $t->string('custom_value1')->default(''); + $t->string('custom_value2')->default(''); + $t->string('custom_value3')->default(''); + $t->string('custom_value4')->default(''); - $t->string('product_key'); - $t->text('notes'); - $t->decimal('cost', 13, 2); - $t->decimal('price', 13, 2); - $t->decimal('quantity', 13, 2)->nullable(); + $t->string('product_key')->default(''); + $t->text('notes')->default(''); + $t->decimal('cost', 13, 2)->default(0); + $t->decimal('price', 13, 2)->default(0); + $t->decimal('quantity', 13, 2)->default(0); - $t->string('tax_name1')->nullable(); - $t->decimal('tax_rate1', 13, 3); - $t->string('tax_name2')->nullable(); - $t->decimal('tax_rate2', 13, 3); + $t->string('tax_name1')->default(''); + $t->decimal('tax_rate1', 13, 3)->default(0); + $t->string('tax_name2')->default(''); + $t->decimal('tax_rate2', 13, 3)->default(0); $t->boolean('is_deleted')->default(false); @@ -703,10 +702,10 @@ class CreateUsersTable extends Migration $t->unsignedInteger('company_gateway_id')->nullable(); $t->unsignedInteger('payment_type_id')->nullable(); $t->unsignedInteger('status_id')->index(); - $t->decimal('amount', 13, 2); + $t->decimal('amount', 13, 2)->default(0); $t->datetime('payment_date')->nullable(); - $t->string('transaction_reference')->nullable(); - $t->string('payer_id')->nullable(); + $t->string('transaction_reference')->default(''); + $t->string('payer_id')->default(''); $t->timestamps(6); $t->softDeletes(); $t->boolean('is_deleted')->default(false); @@ -732,7 +731,7 @@ class CreateUsersTable extends Migration $t->increments('id'); $t->timestamps(6); - $t->string('name'); + $t->string('name')->default(''); $t->boolean('visible')->default(true); }); @@ -741,8 +740,8 @@ class CreateUsersTable extends Migration $table->unsignedInteger('sort_order')->default(10000); $table->boolean('recommended')->default(0); $table->string('site_url', 200)->nullable(); - $table->boolean('is_offsite'); - $table->boolean('is_secure'); + $table->boolean('is_offsite')->default(false); + $table->boolean('is_secure')->default(false); }); DB::table('gateways')->update(['payment_library_id' => 1]); @@ -760,13 +759,13 @@ class CreateUsersTable extends Migration $table->timestamps(6); $table->softDeletes(); - $table->string('custom_value1')->nullable(); - $table->string('custom_value2')->nullable(); + $table->string('custom_value1')->default(''); + $table->string('custom_value2')->default(''); - $table->string('description')->nullable(); + $table->string('description')->default(''); $table->boolean('is_deleted')->default(false); $table->boolean('is_running')->default(false); - $table->text('time_log')->nullable(); + $table->text('time_log')->default(''); $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); @@ -777,10 +776,10 @@ class CreateUsersTable extends Migration Schema::create('banks', function ($table) { $table->increments('id'); - $table->string('name'); - $table->string('remote_id'); - $table->integer('bank_library_id')->default(BANK_LIBRARY_OFX); - $table->text('config'); + $table->string('name')->default(''); + $table->string('remote_id')->default(''); + $table->integer('bank_library_id')->default(1); + $table->text('config')->default(''); }); Schema::create('bank_companies', function ($table) { @@ -788,7 +787,7 @@ class CreateUsersTable extends Migration $table->unsignedInteger('company_id'); $table->unsignedInteger('bank_id'); $table->unsignedInteger('user_id'); - $table->string('username'); + $table->string('username')->default(''); $table->timestamps(6); $table->softDeletes(); @@ -806,8 +805,8 @@ class CreateUsersTable extends Migration $table->unsignedInteger('user_id'); $table->unsignedInteger('bank_company_id'); - $table->string('account_name'); - $table->string('account_number'); + $table->string('account_name')->default(''); + $table->string('account_number')->default(''); $table->timestamps(6); $table->softDeletes(); @@ -821,7 +820,7 @@ class CreateUsersTable extends Migration Schema::create('payment_terms', function ($table) { $table->increments('id'); $table->integer('num_days'); - $table->string('name'); + $table->string('name')->default(''); $table->unsignedInteger('company_id'); $table->unsignedInteger('user_id'); $table->timestamps(6); @@ -868,7 +867,7 @@ class CreateUsersTable extends Migration Schema::create('backups', function ($table) { $table->increments('id'); $table->unsignedInteger('activity_id'); - $table->text('json_backup'); + $table->text('json_backup')->default(''); $table->timestamps(6); $table->foreign('activity_id')->references('id')->on('activities')->onDelete('cascade'); @@ -884,8 +883,8 @@ class CreateUsersTable extends Migration $table->decimal('adjustment', 13, 2)->nullable(); $table->decimal('balance', 13, 2)->nullable(); //this is the clients balance carried forward - $table->text('notes'); - $table->text('hash'); + $table->text('notes')->default(''); + $table->text('hash')->default(''); $table->unsignedInteger('company_ledgerable_id'); $table->string('company_ledgerable_type'); @@ -897,8 +896,8 @@ class CreateUsersTable extends Migration Schema::create('gateway_types', function ($table) { $table->increments('id'); - $table->string('alias'); - $table->string('name'); + $table->string('alias')->default(''); + $table->string('name')->default(''); }); @@ -911,6 +910,8 @@ class CreateUsersTable extends Migration $table->string('gateway_customer_reference')->default(''); $table->unsignedInteger('payment_method_id'); $table->boolean('is_default')->default(0); + $table->softDeletes(); + $table->timestamps(6); $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); @@ -921,7 +922,7 @@ class CreateUsersTable extends Migration $table->unsignedInteger('company_id'); $table->unsignedInteger('user_id')->nullable(); $table->string('name')->default(''); - $table->text('settings'); + $table->text('settings')->default(''); $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); }); diff --git a/resources/views/portal/default/gateways/stripe/create_customer.blade.php b/resources/views/portal/default/gateways/stripe/create_customer.blade.php index ec2c0cdbfe20..f211791b4fd1 100644 --- a/resources/views/portal/default/gateways/stripe/create_customer.blade.php +++ b/resources/views/portal/default/gateways/stripe/create_customer.blade.php @@ -2,11 +2,24 @@ @section('credit_card') + {!! Former::framework('TwitterBootstrap4'); !!} + + {!! Former::horizontal_open() + ->id('server_response') + ->route('client.payment_methods.store') + ->method('POST'); !!} + + {!! Former::hidden('company_gateway_id')->value($gateway->gateway_id) !!} + {!! Former::hidden('payment_method_id')->value($gateway->gateway_type_id) !!} + {!! Former::hidden('gateway_response')->id('gateway_response') !!} + {!! Former::hidden('is_default')->id('is_default') !!} + + {!! Former::close() !!} + +
- -
@@ -14,6 +27,12 @@
+
+ + +
+ +
@@ -54,12 +73,13 @@ console.log(result.error); console.log(result.error.message); - $("#card-errors").empty(); - $("#card-errors").append("" + result.error.message + ""); + $("#card-errors").empty(); + $("#card-errors").append("" + result.error.message + ""); } else { // The setup has succeeded. Display a success message. console.log(result); + postResult(result); } }); }); @@ -73,14 +93,14 @@ $("#card-button").attr("disabled", true); }); + function postResult(result) + { - var form = $(document.createElement('form')); - $(form).attr("action", "{{ route('client.payment_methods.store') }}"); - $(form).attr("method", "POST"); + $("#gateway_response").val(JSON.stringify(result.setupIntent)); + $("#is_default").val($("#proxy_is_default").val()); + $('#server_response').submit(); - var input = $("").attr("type", "hidden").attr("name", "mydata").val("bla"); - $(form).append($(input)); - $(form).submit(); + } diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php index 60ba596d2d3f..6ca04817c2e8 100644 --- a/tests/Feature/CompanyTest.php +++ b/tests/Feature/CompanyTest.php @@ -87,9 +87,9 @@ class CompanyTest extends TestCase ] ) ->assertStatus(200)->decodeResponseJson(); - +\Log::error($response['data'][0]); //$company = Company::find($this->decodePrimaryKey($response['data']['company_users'][0]['company']['id'])); - $company = Company::find($this->decodePrimaryKey($response['data']['id'])); + $company = Company::find($this->decodePrimaryKey($response['data'][0]['company']['id'])); $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'),