Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to string-based ID for gateway types; associate gateway type with payment type

Browse Source
This commit is contained in:
Joshua Dwire 2016-09-08 22:12:32 -04:00
parent 30fcf0e363
commit 3c4ad52463
7 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -1235,7 +1235,7 @@ class AccountController extends BaseController
*/ */
public function savePaymentGatewayLimits() public function savePaymentGatewayLimits()
{ {
$gateway_type_id = intval(Input::get('gateway_type_id')); $gateway_type_id = Input::get('gateway_type_id');
$gateway_settings = AccountGatewaySettings::scope()->where('gateway_type_id', '=', $gateway_type_id)->first(); $gateway_settings = AccountGatewaySettings::scope()->where('gateway_type_id', '=', $gateway_type_id)->first();
if ( ! $gateway_settings) { if ( ! $gateway_settings) {

10
app/Http/routes.php
View File

@ -704,11 +704,11 @@ if (!defined('CONTACT_EMAIL')) {
define('PAYMENT_METHOD_STATUS_VERIFICATION_FAILED', 'verification_failed'); define('PAYMENT_METHOD_STATUS_VERIFICATION_FAILED', 'verification_failed');
define('PAYMENT_METHOD_STATUS_VERIFIED', 'verified'); define('PAYMENT_METHOD_STATUS_VERIFIED', 'verified');
define('GATEWAY_TYPE_CREDIT_CARD', 1); define('GATEWAY_TYPE_CREDIT_CARD', 'credit_card');
define('GATEWAY_TYPE_BANK_TRANSFER', 2); define('GATEWAY_TYPE_BANK_TRANSFER', 'bank_transfer');
define('GATEWAY_TYPE_PAYPAL', 3); define('GATEWAY_TYPE_PAYPAL', 'paypal');
define('GATEWAY_TYPE_BITCOIN', 4); define('GATEWAY_TYPE_BITCOIN', 'bitcoin');
define('GATEWAY_TYPE_DWOLLA', 5); define('GATEWAY_TYPE_DWOLLA', 'dwolla');
define('GATEWAY_TYPE_TOKEN', 'token'); define('GATEWAY_TYPE_TOKEN', 'token');
define('REMINDER1', 'reminder1'); define('REMINDER1', 'reminder1');

2
app/Models/GatewayType.php
View File

@ -12,6 +12,8 @@ class GatewayType extends Eloquent
*/ */
public $timestamps = false; public $timestamps = false;
public $incrementing = false;
/** /**
* @return mixed * @return mixed
*/ */

5
app/Ninja/Datatables/AccountGatewayDatatable.php
View File

@ -156,15 +156,14 @@ class AccountGatewayDatatable extends EntityDatatable
$min = $accountGatewaySettings ? $accountGatewaySettings->min_limit : 0; $min = $accountGatewaySettings ? $accountGatewaySettings->min_limit : 0;
$max = $accountGatewaySettings ? $accountGatewaySettings->max_limit : 0; $max = $accountGatewaySettings ? $accountGatewaySettings->max_limit : 0;
return "javascript:showLimitsModal('{$gatewayType->name}',{$gatewayType->id},$min,$max)"; return "javascript:showLimitsModal('{$gatewayType->name}','{$gatewayType->id}',$min,$max)";
}, },
function ($model) use ($gatewayType) { function ($model) use ($gatewayType) {
// Only show this action if the given gateway supports this gateway type // Only show this action if the given gateway supports this gateway type
$accountGateway = AccountGateway::find($model->id); $accountGateway = AccountGateway::find($model->id);
$paymentDriver = $accountGateway->paymentDriver(); $paymentDriver = $accountGateway->paymentDriver();
$gatewayTypes = $paymentDriver->gatewayTypes();
return in_array($gatewayType->id, $gatewayTypes); return $paymentDriver->handles($gatewayType->id);
} }
]; ];
} }

15
database/migrations/2016_09_05_150625_create_gateway_types.php
View File

@ -12,21 +12,24 @@ class CreateGatewayTypes extends Migration
*/ */
public function up() public function up()
{ {
Schema::dropIfExists('account_gateway_settings');
Schema::dropIfExists('gateway_types'); Schema::dropIfExists('gateway_types');
Schema::create('gateway_types', function($t) Schema::create('gateway_types', function($t)
{ {
$t->increments('id'); $t->string('id');
$t->string('name'); $t->string('name');
$t->primary('id');
}); });
Schema::dropIfExists('account_gateway_settings');
Schema::create('account_gateway_settings', function($t) Schema::create('account_gateway_settings', function($t)
{ {
$t->increments('id'); $t->increments('id');
$t->unsignedInteger('account_id'); $t->unsignedInteger('account_id');
$t->unsignedInteger('user_id'); $t->unsignedInteger('user_id');
$t->unsignedInteger('gateway_type_id')->nullable(); $t->string('gateway_type_id')->nullable();
$t->timestamp('updated_at')->nullable(); $t->timestamp('updated_at')->nullable();
@ -39,6 +42,12 @@ class CreateGatewayTypes extends Migration
$t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade'); $t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');
}); });
Schema::table('payment_types', function($t)
{
$t->string('gateway_type_id')->nullable();
$t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');
});
} }
/** /**
* Reverse the migrations. * Reverse the migrations.

12
database/seeds/GatewayTypesSeeder.php
View File

@ -10,15 +10,15 @@ class GatewayTypesSeeder extends Seeder
$gateway_types = [ $gateway_types = [
['name' => 'Credit Card'], ['id' => 'credit_card', 'name' => 'Credit Card'],
['name' => 'Bank Transfer'], ['id' => 'bank_transfer', 'name' => 'Bank Transfer'],
['name' => 'PayPal'], ['id' => 'paypal', 'name' => 'PayPal'],
['name' => 'Bitcoin'], ['id' => 'bitcoin', 'name' => 'Bitcoin'],
['name' => 'Dwolla'], ['id' => 'dwolla', 'name' => 'Dwolla'],
]; ];
foreach ($gateway_types as $gateway_type) { foreach ($gateway_types as $gateway_type) {
$record = GatewayType::where('name', '=', $gateway_type['name'])->first(); $record = GatewayType::where('id', '=', $gateway_type['id'])->first();
if (!$record) { if (!$record) {
GatewayType::create($gateway_type); GatewayType::create($gateway_type);
} }

47
database/seeds/PaymentTypesSeeder.php
View File

@ -10,32 +10,39 @@ class PaymentTypesSeeder extends Seeder
$paymentTypes = [ $paymentTypes = [
array('name' => 'Apply Credit'), array('name' => 'Apply Credit'),
array('name' => 'Bank Transfer'), array('name' => 'Bank Transfer', 'gateway_type_id' => GATEWAY_TYPE_BANK_TRANSFER),
array('name' => 'Cash'), array('name' => 'Cash'),
array('name' => 'Debit'), array('name' => 'Debit', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'ACH'), array('name' => 'ACH', 'gateway_type_id' => GATEWAY_TYPE_BANK_TRANSFER),
array('name' => 'Visa Card'), array('name' => 'Visa Card', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'MasterCard'), array('name' => 'MasterCard', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'American Express'), array('name' => 'American Express', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Discover Card'), array('name' => 'Discover Card', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Diners Card'), array('name' => 'Diners Card', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'EuroCard'), array('name' => 'EuroCard', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Nova'), array('name' => 'Nova', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Credit Card Other'), array('name' => 'Credit Card Other', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'PayPal'), array('name' => 'PayPal', 'gateway_type_id' => GATEWAY_TYPE_PAYPAL),
array('name' => 'Google Wallet'), array('name' => 'Google Wallet'),
array('name' => 'Check'), array('name' => 'Check'),
array('name' => 'Carte Blanche'), array('name' => 'Carte Blanche', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'UnionPay'), array('name' => 'UnionPay', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'JCB'), array('name' => 'JCB', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Laser'), array('name' => 'Laser', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Maestro'), array('name' => 'Maestro', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Solo'), array('name' => 'Solo', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
array('name' => 'Switch'), array('name' => 'Switch', 'gateway_type_id' => GATEWAY_TYPE_CREDIT_CARD),
]; ];
foreach ($paymentTypes as $paymentType) { foreach ($paymentTypes as $paymentType) {
if (!DB::table('payment_types')->where('name', '=', $paymentType['name'])->get()) { $record = PaymentType::where('name', '=', $paymentType['name'])->first();
if ( $record) {
$record->name = $paymentType['name'];
$record->gateway_type_id = ! empty($paymentType['gateway_type_id']) ? $paymentType['gateway_type_id'] : null;
$record->save();
} else {
PaymentType::create($paymentType); PaymentType::create($paymentType);
} }
} }