Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-31 15:42:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated Payment Library checks to use global variables.

Browse Source
This commit is contained in:
blkmutt 2014-04-06 14:24:56 -04:00
parent 3c99bebae9
commit fabfb14470
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/PaymentController.php
View File

@ -132,7 +132,7 @@ class PaymentController extends \BaseController
$gateway = $invoice->client->account->account_gateways[0]->gateway; $gateway = $invoice->client->account->account_gateways[0]->gateway;
$paymentLibrary = $gateway->paymentlibrary; $paymentLibrary = $gateway->paymentlibrary;
if ($input && $paymentLibrary->name == "Omnipay") if ($input && $paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
{ {
$data = [ $data = [
'firstName' => $input['first_name'], 'firstName' => $input['first_name'],
@ -155,7 +155,7 @@ class PaymentController extends \BaseController
Session::put($key, $data); Session::put($key, $data);
} }
else if ($input && $paymentLibrary->name == "PHP-Payments") else if ($input && $paymentLibrary->id == PAYMENT_LIBRARY_PHP_PAYMENTS)
{ {
$input = Input::all(); $input = Input::all();
$data = [ $data = [
@ -202,7 +202,7 @@ class PaymentController extends \BaseController
$data = []; $data = [];
} }
if($paymentLibrary->name == "Omnipay") if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
{ {
$card = new CreditCard($data); $card = new CreditCard($data);
@ -304,7 +304,7 @@ class PaymentController extends \BaseController
try try
{ {
if($paymentLibrary->name == "Omnipay") if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
{ {
$gateway = self::createGateway($accountGateway); $gateway = self::createGateway($accountGateway);
$details = self::getPaymentDetails($invoice, Input::all()); $details = self::getPaymentDetails($invoice, Input::all());
@ -317,7 +317,7 @@ class PaymentController extends \BaseController
return Redirect::to('payment/' . $invitationKey) return Redirect::to('payment/' . $invitationKey)
->withInput(); ->withInput();
} }
if ($response->isSuccessful()) if ($response->isSuccessful())
{ {
$payment = self::createPayment($invitation, $ref); $payment = self::createPayment($invitation, $ref);
@ -343,7 +343,7 @@ class PaymentController extends \BaseController
return Utils::fatalError('Sorry, there was an error processing your payment. Please try again later.<p>', $response->getMessage()); return Utils::fatalError('Sorry, there was an error processing your payment. Please try again later.<p>', $response->getMessage());
} }
} }
else if ($paymentLibrary->name == "PHP-Payments") else if ($paymentLibrary->id == PAYMENT_LIBRARY_PHP_PAYMENTS)
{ {
$provider = $accountGateway->gateway->provider; $provider = $accountGateway->gateway->provider;
$p = new PHP_Payments; $p = new PHP_Payments;

2
app/models/Gateway.php
View File

@ -19,7 +19,7 @@ class Gateway extends Eloquent
{ {
$paymentLibrary = $this->paymentlibrary; $paymentLibrary = $this->paymentlibrary;
if($paymentLibrary->name == 'Omnipay') if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
{ {
$fields = Omnipay::create($this->provider)->getDefaultParameters(); $fields = Omnipay::create($this->provider)->getDefaultParameters();
} }

2
app/routes.php
View File

@ -241,6 +241,8 @@ define('DEFUALT_LOCALE', 'en');
define('GATEWAY_PAYPAL_EXPRESS', 17); define('GATEWAY_PAYPAL_EXPRESS', 17);
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
define('PAYMENT_LIBRARY_OMNIPAY', 1);
define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2);
if (Auth::check() && !Session::has(SESSION_TIMEZONE)) if (Auth::check() && !Session::has(SESSION_TIMEZONE))
{ {