.'){kind=small}
';
}
} elseif ($paymentMethod->payment_type_id == PAYMENT_TYPE_ID_PAYPAL) {
$html = '.'){kind=small}
';
@@ -860,7 +862,6 @@ class PublicClientController extends BaseController
];
if ($paymentType == PAYMENT_TYPE_STRIPE_ACH) {
-
$data['currencies'] = Cache::get('currencies');
}
@@ -868,6 +869,10 @@ class PublicClientController extends BaseController
$data['braintreeClientToken'] = $this->paymentService->getBraintreeClientToken($account);
}
+ if(!empty($data['braintreeClientToken']) || $accountGateway->getPublishableStripeKey()|| $accountGateway->gateway_id == GATEWAY_WEPAY) {
+ $data['tokenize'] = true;
+ }
+
return View::make('payments.add_paymentmethod', $data);
}
@@ -883,10 +888,12 @@ class PublicClientController extends BaseController
$account = $client->account;
$accountGateway = $account->getGatewayByType($paymentType);
- $sourceToken = $accountGateway->gateway_id == GATEWAY_STRIPE ? Input::get('stripeToken'):Input::get('payment_method_nonce');
+ $sourceToken = Input::get('sourceToken');
- if (!PaymentController::processPaymentClientDetails($client, $accountGateway, $paymentType)) {
- return Redirect::to('client/paymentmethods/add/' . $typeLink)->withInput(Request::except('cvv'));
+ if (($validator = PaymentController::processPaymentClientDetails($client, $accountGateway, $paymentType)) !== true) {
+ return Redirect::to('client/paymentmethods/add/' . $typeLink)
+ ->withErrors($validator)
+ ->withInput(Request::except('cvv'));
}
if ($sourceToken) {
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 47b1a28b1c4e..ca6268b355cb 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -242,6 +242,8 @@ Route::group([
Route::post('/import_csv', 'ImportController@doImportCSV');
Route::resource('gateways', 'AccountGatewayController');
+ Route::get('gateways/{public_id}/resend_confirmation', 'AccountGatewayController@resendConfirmation');
+ Route::get('gateways/switch/wepay', 'AccountGatewayController@switchToWepay');
Route::get('api/gateways', array('as'=>'api.gateways', 'uses'=>'AccountGatewayController@getDatatable'));
Route::post('account_gateways/bulk', 'AccountGatewayController@bulk');
@@ -563,6 +565,10 @@ if (!defined('CONTACT_EMAIL')) {
define('GATEWAY_WEPAY', 60);
define('GATEWAY_BRAINTREE', 61);
+ // The customer exists, but only as a local concept
+ // The remote gateway doesn't understand the concept of customers
+ define('CUSTOMER_REFERENCE_LOCAL', 'local');
+
define('EVENT_CREATE_CLIENT', 1);
define('EVENT_CREATE_INVOICE', 2);
define('EVENT_CREATE_QUOTE', 3);
@@ -704,10 +710,10 @@ if (!defined('CONTACT_EMAIL')) {
define('RESELLER_REVENUE_SHARE', 'A');
define('RESELLER_LIMITED_USERS', 'B');
- define('AUTO_BILL_OFF', 0);
- define('AUTO_BILL_OPT_IN', 1);
- define('AUTO_BILL_OPT_OUT', 2);
- define('AUTO_BILL_ALWAYS', 3);
+ define('AUTO_BILL_OFF', 1);
+ define('AUTO_BILL_OPT_IN', 2);
+ define('AUTO_BILL_OPT_OUT', 3);
+ define('AUTO_BILL_ALWAYS', 4);
// These must be lowercase
define('PLAN_FREE', 'free');
@@ -748,6 +754,15 @@ if (!defined('CONTACT_EMAIL')) {
// Pro users who started paying on or before this date will be able to manage users
define('PRO_USERS_GRANDFATHER_DEADLINE', '2016-05-15');
+ // WePay
+ define('WEPAY_PRODUCTION', 'production');
+ define('WEPAY_STAGE', 'stage');
+ define('WEPAY_CLIENT_ID', env('WEPAY_CLIENT_ID'));
+ define('WEPAY_CLIENT_SECRET', env('WEPAY_CLIENT_SECRET'));
+ define('WEPAY_AUTO_UPDATE', env('WEPAY_AUTO_UPDATE', false));
+ define('WEPAY_ENVIRONMENT', env('WEPAY_ENVIRONMENT', WEPAY_PRODUCTION));
+ define('WEPAY_THEME', env('WEPAY_THEME','{"name":"Invoice Ninja","primary_color":"0b4d78","secondary_color":"0b4d78","background_color":"f8f8f8","button_color":"33b753"}'));
+
$creditCards = [
1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],
2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'],
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 2ed2878a0878..e79d82643917 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -15,6 +15,7 @@ use Log;
use DateTime;
use stdClass;
use Carbon;
+use WePay;
use App\Models\Currency;
@@ -995,4 +996,21 @@ class Utils
return $url;
}
+
+ public static function setupWePay($accountGateway = null)
+ {
+ if (WePay::getEnvironment() == 'none') {
+ if (WEPAY_ENVIRONMENT == WEPAY_STAGE) {
+ WePay::useStaging(WEPAY_CLIENT_ID, WEPAY_CLIENT_SECRET);
+ } else {
+ WePay::useProduction(WEPAY_CLIENT_ID, WEPAY_CLIENT_SECRET);
+ }
+ }
+
+ if ($accountGateway) {
+ return new WePay($accountGateway->getConfig()->accessToken);
+ } else {
+ return new WePay(null);
+ }
+ }
}
diff --git a/app/Listeners/ActivityListener.php b/app/Listeners/ActivityListener.php
index 1df8edeb6848..14ba0da50ec9 100644
--- a/app/Listeners/ActivityListener.php
+++ b/app/Listeners/ActivityListener.php
@@ -307,8 +307,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_DELETE_PAYMENT,
- $payment->amount,
- $payment->amount * -1
+ $payment->amount - $payment->refunded,
+ ($payment->amount - $payment->refunded) * -1
);
}
@@ -343,8 +343,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_FAILED_PAYMENT,
- $payment->amount,
- $payment->amount * -1
+ ($payment->amount - $payment->refunded),
+ ($payment->amount - $payment->refunded) * -1
);
}
@@ -367,8 +367,8 @@ class ActivityListener
$this->activityRepo->create(
$payment,
ACTIVITY_TYPE_RESTORE_PAYMENT,
- $event->fromDeleted ? $payment->amount * -1 : 0,
- $event->fromDeleted ? $payment->amount : 0
+ $event->fromDeleted ? ($payment->amount - $payment->refunded) * -1 : 0,
+ $event->fromDeleted ? ($payment->amount - $payment->refunded) : 0
);
}
}
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 29a9abbd09be..c489d21b180b 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1245,6 +1245,8 @@ class Account extends Eloquent
return GATEWAY_STRIPE;
} elseif ($this->isGatewayConfigured(GATEWAY_BRAINTREE)) {
return GATEWAY_BRAINTREE;
+ } elseif ($this->isGatewayConfigured(GATEWAY_WEPAY)) {
+ return GATEWAY_WEPAY;
} else {
return false;
}
@@ -1410,6 +1412,37 @@ class Account extends Eloquent
public function getFontFolders(){
return array_map(function($item){return $item['folder'];}, $this->getFontsData());
}
+
+ public function canAddGateway($type){
+ if($this->getGatewayByType($type)) {
+ return false;
+ }
+ if ($type == PAYMENT_TYPE_CREDIT_CARD && $this->getGatewayByType(PAYMENT_TYPE_STRIPE)) {
+ // Stripe is already handling credit card payments
+ return false;
+ }
+
+ if ($type == PAYMENT_TYPE_STRIPE && $this->getGatewayByType(PAYMENT_TYPE_CREDIT_CARD)) {
+ // Another gateway is already handling credit card payments
+ return false;
+ }
+
+ if ($type == PAYMENT_TYPE_DIRECT_DEBIT && $stripeGateway = $this->getGatewayByType(PAYMENT_TYPE_STRIPE)) {
+ if (!empty($stripeGateway->getAchEnabled())) {
+ // Stripe is already handling ACH payments
+ return false;
+ }
+ }
+
+ if ($type == PAYMENT_TYPE_PAYPAL && $braintreeGateway = $this->getGatewayConfig(GATEWAY_BRAINTREE)) {
+ if (!empty($braintreeGateway->getPayPalEnabled())) {
+ // PayPal is already enabled
+ return false;
+ }
+ }
+
+ return true;
+ }
}
Account::updated(function ($account) {
diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php
index 6de95e8593cf..0c281856be66 100644
--- a/app/Models/AccountGateway.php
+++ b/app/Models/AccountGateway.php
@@ -77,7 +77,7 @@ class AccountGateway extends EntityModel
return !empty($this->getConfigField('enableAch'));
}
- public function getPayPAlEnabled()
+ public function getPayPalEnabled()
{
return !empty($this->getConfigField('enablePayPal'));
}
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 9171c9d22c69..85a10acafbbe 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -167,7 +167,7 @@ class Payment extends EntityModel
return ENTITY_PAYMENT;
}
- public function getBankData()
+ public function getBankDataAttribute()
{
if (!$this->routing_number) {
return null;
diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php
index 07c6d2e19e1f..a2f17b722ae6 100644
--- a/app/Models/PaymentMethod.php
+++ b/app/Models/PaymentMethod.php
@@ -63,7 +63,7 @@ class PaymentMethod extends EntityModel
return $this->hasMany('App\Models\Payments');
}
- public function getBankData()
+ public function getBankDataAttribute()
{
if (!$this->routing_number) {
return null;
diff --git a/app/Ninja/Repositories/AccountGatewayRepository.php b/app/Ninja/Repositories/AccountGatewayRepository.php
index b61f854f2dc5..286c8416a21a 100644
--- a/app/Ninja/Repositories/AccountGatewayRepository.php
+++ b/app/Ninja/Repositories/AccountGatewayRepository.php
@@ -15,10 +15,14 @@ class AccountGatewayRepository extends BaseRepository
public function find($accountId)
{
- return DB::table('account_gateways')
+ $query = DB::table('account_gateways')
->join('gateways', 'gateways.id', '=', 'account_gateways.gateway_id')
- ->where('account_gateways.deleted_at', '=', null)
- ->where('account_gateways.account_id', '=', $accountId)
- ->select('account_gateways.public_id', 'gateways.name', 'account_gateways.deleted_at', 'account_gateways.gateway_id');
+ ->where('account_gateways.account_id', '=', $accountId);
+
+ if (!\Session::get('show_trash:gateway')) {
+ $query->where('account_gateways.deleted_at', '=', null);
+ }
+
+ return $query->select('account_gateways.id', 'account_gateways.public_id', 'gateways.name', 'account_gateways.deleted_at', 'account_gateways.gateway_id');
}
}
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index fd493ba16d93..979304ed01a0 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -324,7 +324,7 @@ class InvoiceRepository extends BaseRepository
$invoice->start_date = Utils::toSqlDate($data['start_date']);
$invoice->end_date = Utils::toSqlDate($data['end_date']);
$invoice->client_enable_auto_bill = isset($data['client_enable_auto_bill']) && $data['client_enable_auto_bill'] ? true : false;
- $invoice->auto_bill = isset($data['auto_bill']) ? intval($data['auto_bill']) : 0;
+ $invoice->auto_bill = isset($data['auto_bill']) ? intval($data['auto_bill']) : AUTO_BILL_OFF;
if ($invoice->auto_bill < AUTO_BILL_OFF || $invoice->auto_bill > AUTO_BILL_ALWAYS ) {
$invoice->auto_bill = AUTO_BILL_OFF;
diff --git a/app/Services/AccountGatewayService.php b/app/Services/AccountGatewayService.php
index bd5635e0dd52..a992da5c82c9 100644
--- a/app/Services/AccountGatewayService.php
+++ b/app/Services/AccountGatewayService.php
@@ -2,6 +2,7 @@
use URL;
use App\Models\Gateway;
+use App\Models\AccountGateway;
use App\Services\BaseService;
use App\Ninja\Repositories\AccountGatewayRepository;
@@ -41,7 +42,40 @@ class AccountGatewayService extends BaseService
[
'name',
function ($model) {
- return link_to("gateways/{$model->public_id}/edit", $model->name)->toHtml();
+ if ($model->deleted_at) {
+ return $model->name;
+ } elseif ($model->gateway_id != GATEWAY_WEPAY) {
+ return link_to("gateways/{$model->public_id}/edit", $model->name)->toHtml();
+ } else {
+ $accountGateway = AccountGateway::find($model->id);
+ $endpoint = WEPAY_ENVIRONMENT == WEPAY_STAGE ? 'https://stage.wepay.com/' : 'https://www.wepay.com/';
+ $wepayAccountId = $accountGateway->getConfig()->accountId;
+ $linkText = $model->name;
+ $url = $endpoint.'account/'.$wepayAccountId;
+ $wepay = \Utils::setupWepay($accountGateway);
+ $html = link_to($url, $linkText, array('target'=>'_blank'))->toHtml();
+
+ try {
+ $wepayAccount = $wepay->request('/account', array('account_id' => $wepayAccountId));
+ if ($wepayAccount->state == 'action_required') {
+ $updateUri = $wepay->request('/account/get_update_uri', array(
+ 'account_id' => $wepayAccountId,
+ 'redirect_uri' => URL::to('gateways'),
+ ));
+
+ $linkText .= ' ('.trans('texts.action_required').')';
+ $url = $updateUri->uri;
+ $html = "{$linkText}";
+ $model->setupUrl = $url;
+ } elseif ($wepayAccount->state == 'pending') {
+ $linkText .= ' ('.trans('texts.resend_confirmation_email').')';
+ $model->resendConfirmationUrl = $url = URL::to("gateways/{$accountGateway->public_id}/resend_confirmation");
+ $html = link_to($url, $linkText)->toHtml();
+ }
+ } catch(\WePayException $ex){}
+
+ return $html;
+ }
}
],
[
@@ -57,9 +91,41 @@ class AccountGatewayService extends BaseService
{
return [
[
+ uctrans('texts.resend_confirmation_email'),
+ function ($model) {
+ return $model->resendConfirmationUrl;
+ },
+ function($model) {
+ return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY && !empty($model->resendConfirmationUrl);
+ }
+ ], [
+ uctrans('texts.finish_setup'),
+ function ($model) {
+ return $model->setupUrl;
+ },
+ function($model) {
+ return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY && !empty($model->setupUrl);
+ }
+ ] , [
uctrans('texts.edit_gateway'),
function ($model) {
return URL::to("gateways/{$model->public_id}/edit");
+ },
+ function($model) {
+ return !$model->deleted_at;
+ }
+ ], [
+ uctrans('texts.manage_wepay_account'),
+ function ($model) {
+ $accountGateway = AccountGateway::find($model->id);
+ $endpoint = WEPAY_ENVIRONMENT == WEPAY_STAGE ? 'https://stage.wepay.com/' : 'https://www.wepay.com/';
+ return array(
+ 'url' => $endpoint.'account/'.$accountGateway->getConfig()->accountId,
+ 'attributes' => 'target="_blank"'
+ );
+ },
+ function($model) {
+ return !$model->deleted_at && $model->gateway_id == GATEWAY_WEPAY;
}
]
];
diff --git a/app/Services/DatatableService.php b/app/Services/DatatableService.php
index 3d9001a095b7..df4c9d93d55d 100644
--- a/app/Services/DatatableService.php
+++ b/app/Services/DatatableService.php
@@ -60,11 +60,7 @@ class DatatableService
$str .= '';
}
- $str .= '';
+ if (!empty($dropdown_contents)) {
+ $str .= '';
});
}
diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index b97bbbd67de4..d1a0a29a7154 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -9,6 +9,7 @@ use Cache;
use Omnipay;
use Session;
use CreditCard;
+use WePay;
use App\Models\Payment;
use App\Models\PaymentMethod;
use App\Models\Account;
@@ -30,7 +31,8 @@ class PaymentService extends BaseService
protected static $refundableGateways = array(
GATEWAY_STRIPE,
- GATEWAY_BRAINTREE
+ GATEWAY_BRAINTREE,
+ GATEWAY_WEPAY,
);
public function __construct(PaymentRepository $paymentRepo, AccountRepository $accountRepo, DatatableService $datatableService)
@@ -95,9 +97,9 @@ class PaymentService extends BaseService
$data['ButtonSource'] = 'InvoiceNinja_SP';
};
- if ($input && $accountGateway->isGateway(GATEWAY_STRIPE)) {
- if (!empty($input['stripeToken'])) {
- $data['token'] = $input['stripeToken'];
+ if ($input) {
+ if (!empty($input['sourceToken'])) {
+ $data['token'] = $input['sourceToken'];
unset($data['card']);
} elseif (!empty($input['plaidPublicToken'])) {
$data['plaidPublicToken'] = $input['plaidPublicToken'];
@@ -106,6 +108,10 @@ class PaymentService extends BaseService
}
}
+ if ($accountGateway->isGateway(GATEWAY_WEPAY) && $transactionId = Session::get($invitation->id.'payment_ref')) {
+ $data['transaction_id'] = $transactionId;
+ }
+
return $data;
}
@@ -125,7 +131,7 @@ class PaymentService extends BaseService
$data['cvv'] = $input['cvv'];
}
- if (isset($input['country_id'])) {
+ if (isset($input['address1'])) {
$country = Country::find($input['country_id']);
$data = array_merge($data, [
@@ -216,7 +222,7 @@ class PaymentService extends BaseService
public function verifyClientPaymentMethod($client, $publicId, $amount1, $amount2)
{
- $token = $client->getGatewayToken($accountGateway);
+ $token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */);
if ($accountGateway->gateway_id != GATEWAY_STRIPE) {
return 'Unsupported gateway';
}
@@ -232,15 +238,18 @@ class PaymentService extends BaseService
'amounts[]=' . intval($amount1) . '&amounts[]=' . intval($amount2)
);
- if (!is_string($result)) {
- $paymentMethod->status = PAYMENT_METHOD_STATUS_VERIFIED;
- $paymentMethod->save();
-
- if (!$paymentMethod->account_gateway_token->default_payment_method_id) {
- $paymentMethod->account_gateway_token->default_payment_method_id = $paymentMethod->id;
- $paymentMethod->account_gateway_token->save();
- }
+ if (is_string($result)) {
+ return $result;
}
+
+ $paymentMethod->status = PAYMENT_METHOD_STATUS_VERIFIED;
+ $paymentMethod->save();
+
+ if (!$paymentMethod->account_gateway_token->default_payment_method_id) {
+ $paymentMethod->account_gateway_token->default_payment_method_id = $paymentMethod->id;
+ $paymentMethod->account_gateway_token->save();
+ }
+
return true;
}
@@ -266,6 +275,17 @@ class PaymentService extends BaseService
if (!$response->isSuccessful()) {
return $response->getMessage();
}
+ } elseif ($accountGateway->gateway_id == GATEWAY_WEPAY) {
+ try {
+ $wepay = Utils::setupWePay($accountGateway);
+ $wepay->request('/credit_card/delete', [
+ 'client_id' => WEPAY_CLIENT_ID,
+ 'client_secret' => WEPAY_CLIENT_SECRET,
+ 'credit_card_id' => intval($paymentMethod->source_reference),
+ ]);
+ } catch (\WePayException $ex){
+ return $ex->getMessage();
+ }
}
$paymentMethod->delete();
@@ -291,16 +311,16 @@ class PaymentService extends BaseService
{
$customerReference = $client->getGatewayToken($accountGateway, $accountGatewayToken/* return paramenter */);
- if ($customerReference) {
+ if ($customerReference && $customerReference != CUSTOMER_REFERENCE_LOCAL) {
$details['customerReference'] = $customerReference;
- if ($accountGateway->gateway->id == GATEWAY_STRIPE) {
+ if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
$customerResponse = $gateway->fetchCustomer(array('customerReference' => $customerReference))->send();
if (!$customerResponse->isSuccessful()) {
$customerReference = null; // The customer might not exist anymore
}
- } elseif ($accountGateway->gateway->id == GATEWAY_BRAINTREE) {
+ } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
$customer = $gateway->findCustomer($customerReference)->send()->getData();
if (!($customer instanceof \Braintree\Customer)) {
@@ -309,7 +329,7 @@ class PaymentService extends BaseService
}
}
- if ($accountGateway->gateway->id == GATEWAY_STRIPE) {
+ if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
if (!empty($details['plaidPublicToken'])) {
$plaidResult = $this->getPlaidToken($accountGateway, $details['plaidPublicToken'], $details['plaidAccountId']);
@@ -355,7 +375,7 @@ class PaymentService extends BaseService
return;
}
}
- } elseif ($accountGateway->gateway->id == GATEWAY_BRAINTREE) {
+ } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
if (!$customerReference) {
$tokenResponse = $gateway->createCustomer(array('customerData' => array()))->send();
if ($tokenResponse->isSuccessful()) {
@@ -377,6 +397,38 @@ class PaymentService extends BaseService
return;
}
}
+ } elseif ($accountGateway->gateway_id == GATEWAY_WEPAY) {
+ $wepay = Utils::setupWePay($accountGateway);
+
+ try {
+ $wepay->request('credit_card/authorize', array(
+ 'client_id' => WEPAY_CLIENT_ID,
+ 'client_secret' => WEPAY_CLIENT_SECRET,
+ 'credit_card_id' => intval($details['token']),
+ ));
+
+ // Update the callback uri and get the card details
+ $wepay->request('credit_card/modify', array(
+ 'client_id' => WEPAY_CLIENT_ID,
+ 'client_secret' => WEPAY_CLIENT_SECRET,
+ 'credit_card_id' => intval($details['token']),
+ 'auto_update' => WEPAY_AUTO_UPDATE,
+ 'callback_uri' => URL::to(env('WEBHOOK_PREFIX','').'paymenthook/'.$client->account->account_key.'/'.GATEWAY_WEPAY),
+ ));
+ $tokenResponse = $wepay->request('credit_card', array(
+ 'client_id' => WEPAY_CLIENT_ID,
+ 'client_secret' => WEPAY_CLIENT_SECRET,
+ 'credit_card_id' => intval($details['token']),
+ ));
+
+ $customerReference = CUSTOMER_REFERENCE_LOCAL;
+ $sourceReference = $details['token'];
+ } catch (\WePayException $ex) {
+ $this->lastError = $ex->getMessage();
+ return;
+ }
+ } else {
+ return null;
}
if ($customerReference) {
@@ -394,7 +446,7 @@ class PaymentService extends BaseService
$accountGatewayToken->token = $customerReference;
$accountGatewayToken->save();
- $paymentMethod = $this->createPaymentMethodFromGatewayResponse($tokenResponse, $accountGateway, $accountGatewayToken, $contactId);
+ $paymentMethod = $this->convertPaymentMethodFromGatewayResponse($tokenResponse, $accountGateway, $accountGatewayToken, $contactId);
} else {
$this->lastError = $tokenResponse->getMessage();
@@ -422,7 +474,7 @@ class PaymentService extends BaseService
$paymentMethod->setRelation('currency', $currency);
}
} elseif ($source['object'] == 'card') {
- $paymentMethod->expiration = $source['exp_year'] . '-' . $source['exp_month'] . '-00';
+ $paymentMethod->expiration = $source['exp_year'] . '-' . $source['exp_month'] . '-01';
$paymentMethod->payment_type_id = $this->parseCardType($source['brand']);
} else {
return null;
@@ -442,7 +494,7 @@ class PaymentService extends BaseService
if ($source instanceof \Braintree\CreditCard) {
$paymentMethod->payment_type_id = $this->parseCardType($source->cardType);
$paymentMethod->last4 = $source->last4;
- $paymentMethod->expiration = $source->expirationYear . '-' . $source->expirationMonth . '-00';
+ $paymentMethod->expiration = $source->expirationYear . '-' . $source->expirationMonth . '-01';
} elseif ($source instanceof \Braintree\PayPalAccount) {
$paymentMethod->email = $source->email;
$paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL;
@@ -456,8 +508,24 @@ class PaymentService extends BaseService
return $paymentMethod;
}
+
+ public function convertPaymentMethodFromWePay($source, $accountGatewayToken = null, $paymentMethod = null) {
+ // Creating a new one or updating an existing one
+ if (!$paymentMethod) {
+ $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod();
+ }
+
+ $paymentMethod->payment_type_id = $this->parseCardType($source->credit_card_name);
+ $paymentMethod->last4 = $source->last_four;
+ $paymentMethod->expiration = $source->expiration_year . '-' . $source->expiration_month . '-01';
+ $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id));
+
+ $paymentMethod->source_reference = $source->credit_card_id;
+
+ return $paymentMethod;
+ }
- public function createPaymentMethodFromGatewayResponse($gatewayResponse, $accountGateway, $accountGatewayToken = null, $contactId = null) {
+ public function convertPaymentMethodFromGatewayResponse($gatewayResponse, $accountGateway, $accountGatewayToken = null, $contactId = null, $existingPaymentMethod = null) {
if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
$data = $gatewayResponse->getData();
if (!empty($data['object']) && ($data['object'] == 'card' || $data['object'] == 'bank_account')) {
@@ -470,7 +538,7 @@ class PaymentService extends BaseService
}
if ($source) {
- $paymentMethod = $this->convertPaymentMethodFromStripe($source, $accountGatewayToken);
+ $paymentMethod = $this->convertPaymentMethodFromStripe($source, $accountGatewayToken, $existingPaymentMethod);
}
} elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
$data = $gatewayResponse->getData();
@@ -478,11 +546,16 @@ class PaymentService extends BaseService
if (!empty($data->transaction)) {
$transaction = $data->transaction;
- $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod();
+ if ($existingPaymentMethod) {
+ $paymentMethod = $existingPaymentMethod;
+ } else {
+ $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod();
+ }
+
if ($transaction->paymentInstrumentType == 'credit_card') {
$card = $transaction->creditCardDetails;
$paymentMethod->last4 = $card->last4;
- $paymentMethod->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00';
+ $paymentMethod->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-01';
$paymentMethod->payment_type_id = $this->parseCardType($card->cardType);
} elseif ($transaction->paymentInstrumentType == 'paypal_account') {
$paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL;
@@ -490,9 +563,20 @@ class PaymentService extends BaseService
}
$paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id));
} elseif (!empty($data->paymentMethod)) {
- $paymentMethod = $this->convertPaymentMethodFromBraintree($data->paymentMethod, $accountGatewayToken);
+ $paymentMethod = $this->convertPaymentMethodFromBraintree($data->paymentMethod, $accountGatewayToken, $existingPaymentMethod);
}
+ } elseif ($accountGateway->gateway_id == GATEWAY_WEPAY) {
+ if ($gatewayResponse instanceof \Omnipay\WePay\Message\CustomCheckoutResponse) {
+ $wepay = \Utils::setupWePay($accountGateway);
+ $gatewayResponse = $wepay->request('credit_card', array(
+ 'client_id' => WEPAY_CLIENT_ID,
+ 'client_secret' => WEPAY_CLIENT_SECRET,
+ 'credit_card_id' => $gatewayResponse->getData()['payment_method']['credit_card']['id'],
+ ));
+
+ }
+ $paymentMethod = $this->convertPaymentMethodFromWePay($gatewayResponse, $accountGatewayToken, $existingPaymentMethod);
}
if (!empty($paymentMethod) && $accountGatewayToken && $contactId) {
@@ -566,43 +650,49 @@ class PaymentService extends BaseService
$payment->payment_type_id = $this->detectCardType($card->getNumber());
}
+ $savePaymentMethod = !empty($paymentMethod);
+
+ // This will convert various gateway's formats to a known format
+ $paymentMethod = $this->convertPaymentMethodFromGatewayResponse($purchaseResponse, $accountGateway, null, null, $paymentMethod);
+
+ // If this is a stored payment method, we'll update it with the latest info
+ if ($savePaymentMethod) {
+ $paymentMethod->save();
+ }
+
if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
$data = $purchaseResponse->getData();
- $source = !empty($data['source'])?$data['source']:$data['card'];
-
$payment->payment_status_id = $data['status'] == 'succeeded' ? PAYMENT_STATUS_COMPLETED : PAYMENT_STATUS_PENDING;
-
- if ($source) {
- $payment->last4 = $source['last4'];
-
- if ($source['object'] == 'bank_account') {
- $payment->routing_number = $source['routing_number'];
- $payment->payment_type_id = PAYMENT_TYPE_ACH;
- }
- else{
- $payment->expiration = $source['exp_year'] . '-' . $source['exp_month'] . '-00';
- $payment->payment_type_id = $this->parseCardType($source['brand']);
- }
- }
- } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
- $transaction = $purchaseResponse->getData()->transaction;
- if ($transaction->paymentInstrumentType == 'credit_card') {
- $card = $transaction->creditCardDetails;
- $payment->last4 = $card->last4;
- $payment->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00';
- $payment->payment_type_id = $this->parseCardType($card->cardType);
- } elseif ($transaction->paymentInstrumentType == 'paypal_account') {
- $payment->payment_type_id = PAYMENT_TYPE_ID_PAYPAL;
- $payment->email = $transaction->paypalDetails->payerEmail;
- }
- }
-
- if ($payerId) {
- $payment->payer_id = $payerId;
}
if ($paymentMethod) {
- $payment->payment_method_id = $paymentMethod->id;
+ if ($paymentMethod->last4) {
+ $payment->last4 = $paymentMethod->last4;
+ }
+
+ if ($paymentMethod->expiration) {
+ $payment->expiration = $paymentMethod->expiration;
+ }
+
+ if ($paymentMethod->routing_number) {
+ $payment->routing_number = $paymentMethod->routing_number;
+ }
+
+ if ($paymentMethod->payment_type_id) {
+ $payment->payment_type_id = $paymentMethod->payment_type_id;
+ }
+
+ if ($paymentMethod->email) {
+ $payment->email = $paymentMethod->email;
+ }
+
+ if ($payerId) {
+ $payment->payer_id = $payerId;
+ }
+
+ if ($savePaymentMethod) {
+ $payment->payment_method_id = $paymentMethod->id;
+ }
}
$payment->save();
@@ -665,20 +755,29 @@ class PaymentService extends BaseService
private function parseCardType($cardName) {
$cardTypes = array(
- 'Visa' => PAYMENT_TYPE_VISA,
- 'American Express' => PAYMENT_TYPE_AMERICAN_EXPRESS,
- 'MasterCard' => PAYMENT_TYPE_MASTERCARD,
- 'Discover' => PAYMENT_TYPE_DISCOVER,
- 'JCB' => PAYMENT_TYPE_JCB,
- 'Diners Club' => PAYMENT_TYPE_DINERS,
- 'Carte Blanche' => PAYMENT_TYPE_CARTE_BLANCHE,
- 'China UnionPay' => PAYMENT_TYPE_UNIONPAY,
- 'Laser' => PAYMENT_TYPE_LASER,
- 'Maestro' => PAYMENT_TYPE_MAESTRO,
- 'Solo' => PAYMENT_TYPE_SOLO,
- 'Switch' => PAYMENT_TYPE_SWITCH
+ 'visa' => PAYMENT_TYPE_VISA,
+ 'americanexpress' => PAYMENT_TYPE_AMERICAN_EXPRESS,
+ 'amex' => PAYMENT_TYPE_AMERICAN_EXPRESS,
+ 'mastercard' => PAYMENT_TYPE_MASTERCARD,
+ 'discover' => PAYMENT_TYPE_DISCOVER,
+ 'jcb' => PAYMENT_TYPE_JCB,
+ 'dinersclub' => PAYMENT_TYPE_DINERS,
+ 'carteblanche' => PAYMENT_TYPE_CARTE_BLANCHE,
+ 'chinaunionpay' => PAYMENT_TYPE_UNIONPAY,
+ 'unionpay' => PAYMENT_TYPE_UNIONPAY,
+ 'laser' => PAYMENT_TYPE_LASER,
+ 'maestro' => PAYMENT_TYPE_MAESTRO,
+ 'solo' => PAYMENT_TYPE_SOLO,
+ 'switch' => PAYMENT_TYPE_SWITCH
);
+ $cardName = strtolower(str_replace(array(' ', '-', '_'), '', $cardName));
+
+ if (empty($cardTypes[$cardName]) && 1 == preg_match('/^('.implode('|', array_keys($cardTypes)).')/', $cardName, $matches)) {
+ // Some gateways return extra stuff after the card name
+ $cardName = $matches[1];
+ }
+
if (!empty($cardTypes[$cardName])) {
return $cardTypes[$cardName];
} else {
@@ -725,6 +824,11 @@ class PaymentService extends BaseService
$invitation = $invoice->invitations->first();
$token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */);
+
+ if (!$accountGatewayToken) {
+ return false;
+ }
+
$defaultPaymentMethod = $accountGatewayToken->default_payment_method;
if (!$invitation || !$token || !$defaultPaymentMethod) {
@@ -736,10 +840,9 @@ class PaymentService extends BaseService
$details = $this->getPaymentDetails($invitation, $accountGateway);
$details['customerReference'] = $token;
- if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
- $details['cardReference'] = $defaultPaymentMethod->source_reference;
- } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
- $details['paymentMethodToken'] = $defaultPaymentMethod->source_reference;
+ $details['token'] = $defaultPaymentMethod->source_reference;
+ if ($accountGateway->gateway_id == GATEWAY_WEPAY) {
+ $details['transaction_id'] = 'autobill_'.$invoice->id;
}
// submit purchase/get response
@@ -948,41 +1051,76 @@ class PaymentService extends BaseService
if ($payment->payment_type_id != PAYMENT_TYPE_CREDIT) {
$gateway = $this->createGateway($accountGateway);
- $refund = $gateway->refund(array(
- 'transactionReference' => $payment->transaction_reference,
- 'amount' => $amount,
- ));
- $response = $refund->send();
-
- if ($response->isSuccessful()) {
- $payment->recordRefund($amount);
+
+ if ($accountGateway->gateway_id != GATEWAY_WEPAY) {
+ $refund = $gateway->refund(array(
+ 'transactionReference' => $payment->transaction_reference,
+ 'amount' => $amount,
+ ));
+ $response = $refund->send();
+
+ if ($response->isSuccessful()) {
+ $payment->recordRefund($amount);
+ } else {
+ $data = $response->getData();
+
+ if ($data instanceof \Braintree\Result\Error) {
+ $error = $data->errors->deepAll()[0];
+ if ($error && $error->code == 91506) {
+ if ($amount == $payment->amount) {
+ // This is an unsettled transaction; try to void it
+ $void = $gateway->void(array(
+ 'transactionReference' => $payment->transaction_reference,
+ ));
+ $response = $void->send();
+
+ if ($response->isSuccessful()) {
+ $payment->markVoided();
+ }
+ } else {
+ $this->error('Unknown', 'Partial refund not allowed for unsettled transactions.', $accountGateway);
+ return false;
+ }
+ }
+ }
+
+ if (!$response->isSuccessful()) {
+ $this->error('Unknown', $response->getMessage(), $accountGateway);
+ return false;
+ }
+ }
} else {
- $data = $response->getData();
+ $wepay = \Utils::setupWePay($accountGateway);
- if ($data instanceof \Braintree\Result\Error) {
- $error = $data->errors->deepAll()[0];
- if ($error && $error->code == 91506) {
+ try {
+ $wepay->request('checkout/refund', array(
+ 'checkout_id' => intval($payment->transaction_reference),
+ 'refund_reason' => 'Refund issued by merchant.',
+ 'amount' => $amount,
+ ));
+ $payment->recordRefund($amount);
+ } catch (\WePayException $ex) {
+ if ($ex->getCode() == 4004) {
if ($amount == $payment->amount) {
- // This is an unsettled transaction; try to void it
- $void = $gateway->void(array(
- 'transactionReference' => $payment->transaction_reference,
- ));
- $response = $void->send();
-
- if ($response->isSuccessful()) {
+ try {
+ // This is an uncaptured transaction; try to cancel it
+ $wepay->request('checkout/cancel', array(
+ 'checkout_id' => intval($payment->transaction_reference),
+ 'cancel_reason' => 'Refund issued by merchant.',
+ ));
$payment->markVoided();
+ } catch (\WePayException $ex) {
+ $this->error('Unknown', $ex->getMessage(), $accountGateway);
}
} else {
$this->error('Unknown', 'Partial refund not allowed for unsettled transactions.', $accountGateway);
return false;
}
+ } else {
+ $this->error('Unknown', $ex->getMessage(), $accountGateway);
}
}
- if (!$response->isSuccessful()) {
- $this->error('Unknown', $response->getMessage(), $accountGateway);
- return false;
- }
}
} else {
$payment->recordRefund($amount);
diff --git a/composer.json b/composer.json
index 01c6a26f51cf..cff2d85bcbba 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,8 @@
"league/flysystem-rackspace": "~1.0",
"barracudanetworks/archivestream-php": "^1.0",
"omnipay/braintree": "~2.0@dev",
- "gatepay/FedACHdir": "dev-master@dev"
+ "gatepay/FedACHdir": "dev-master@dev",
+ "wepay/php-sdk": "^0.2"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
diff --git a/composer.lock b/composer.lock
index e167cfb38e9c..d694f04f6960 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "7139e4aedb2ac151079c50ee5c17f93c",
- "content-hash": "a314d6c0a16785dd2395a7fd73cdc76d",
+ "hash": "b2471aea1af5ef67a1379ad95b5138f7",
+ "content-hash": "df30a311df0341933d4ff2c3aa5974a6",
"packages": [
{
"name": "agmscode/omnipay-agms",
@@ -505,7 +505,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e97ed532f09e290b91ff7713b785ed7ab11d0812",
+ "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/f7b31bdbdceaaea930c71df20e4180b0b7172b4a",
"reference": "e97ed532f09e290b91ff7713b785ed7ab11d0812",
"shasum": ""
},
@@ -2785,7 +2785,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
+ "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/c8d80c3b48bae2bab071f283f75b1cd8624ed3c7",
"reference": "40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
"shasum": ""
},
@@ -8057,6 +8057,53 @@
],
"time": "2016-02-25 10:29:59"
},
+ {
+ "name": "wepay/php-sdk",
+ "version": "0.2.7",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wepay/PHP-SDK.git",
+ "reference": "31bfcdd97d2c9c33c9c09129638ae31840822182"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/wepay/PHP-SDK/zipball/31bfcdd97d2c9c33c9c09129638ae31840822182",
+ "reference": "31bfcdd97d2c9c33c9c09129638ae31840822182",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.2.x-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "wepay.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "WePay",
+ "email": "api@wepay.com"
+ }
+ ],
+ "description": "WePay APIv2 SDK for PHP",
+ "keywords": [
+ "payment",
+ "sdk",
+ "wepay"
+ ],
+ "time": "2015-08-14 19:42:37"
+ },
{
"name": "wildbit/laravel-postmark-provider",
"version": "3.0.0",
@@ -10024,4 +10071,4 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": []
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php
index 1c277d8da6b2..35a1b6134e9b 100644
--- a/database/migrations/2016_04_23_182223_payments_changes.php
+++ b/database/migrations/2016_04_23_182223_payments_changes.php
@@ -78,6 +78,11 @@ class PaymentsChanges extends Migration
->where('auto_bill', '=', 1)
->update(array('client_enable_auto_bill' => 1, 'auto_bill' => AUTO_BILL_OPT_OUT));
+ \DB::table('invoices')
+ ->where('auto_bill', '=', 0)
+ ->where('is_recurring', '=', 1)
+ ->update(array('auto_bill' => AUTO_BILL_OFF));
+
Schema::table('account_gateway_tokens', function($table)
{
@@ -113,11 +118,15 @@ class PaymentsChanges extends Migration
$table->dropColumn('payment_method_id');
});
+ \DB::table('invoices')
+ ->where('auto_bill', '=', AUTO_BILL_OFF)
+ ->update(array('auto_bill' => 0));
+
\DB::table('invoices')
->where(function($query){
$query->where('auto_bill', '=', AUTO_BILL_ALWAYS);
$query->orwhere(function($query){
- $query->where('auto_bill', '!=', AUTO_BILL_OFF);
+ $query->where('auto_bill', '!=', 0);
$query->where('client_enable_auto_bill', '=', 1);
});
})
diff --git a/public/built.js b/public/built.js
index 14f82399435f..06790ce1e6ed 100644
--- a/public/built.js
+++ b/public/built.js
@@ -30933,7 +30933,7 @@ function truncate(string, length){
// Show/hide the 'Select' option in the datalists
function actionListHandler() {
- $('tbody tr').mouseover(function() {
+ $('tbody tr .tr-action').closest('tr').mouseover(function() {
$(this).closest('tr').find('.tr-action').show();
$(this).closest('tr').find('.tr-status').hide();
}).mouseout(function() {
diff --git a/public/js/script.js b/public/js/script.js
index a76e6d37cd0e..a66c48768bb6 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1042,7 +1042,7 @@ function truncate(string, length){
// Show/hide the 'Select' option in the datalists
function actionListHandler() {
- $('tbody tr').mouseover(function() {
+ $('tbody tr .tr-action').closest('tr').mouseover(function() {
$(this).closest('tr').find('.tr-action').show();
$(this).closest('tr').find('.tr-status').hide();
}).mouseout(function() {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 920ff5dd7ca3..681640e2575b 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1282,6 +1282,26 @@ $LANG = array(
'import_ofx' => 'Import OFX',
'ofx_file' => 'OFX File',
'ofx_parse_failed' => 'Failed to parse OFX file',
+
+ // WePay
+ 'wepay' => 'WePay',
+ 'sign_up_with_wepay' => 'Sign up with WePay',
+ 'use_another_provider' => 'Use another provider',
+ 'company_name' => 'Company Name',
+ 'wepay_company_name_help' => 'This will appear on client\'s credit card statements.',
+ 'wepay_description_help' => 'The purpose of this account.',
+ 'wepay_tos_agree' => 'I agree to the :link.',
+ 'wepay_tos_link_text' => 'WePay Terms of Service',
+ 'resend_confirmation_email' => 'Resend Confirmation Email',
+ 'manage_wepay_account' => 'Manage WePay Account',
+ 'action_required' => 'Action Required',
+ 'finish_setup' => 'Finish Setup',
+ 'created_wepay_confirmation_required' => 'Please check your email and confirm your email address with WePay.',
+ 'switch_to_wepay' => 'Switch to WePay',
+ 'switch' => 'Switch',
+ 'restore_account_gateway' => 'Restore Gateway',
+ 'restored_account_gateway' => 'Successfully restored gateway',
+
);
return $LANG;
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index ade161f5b65f..155ef6579f69 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -5,15 +5,18 @@
@include('accounts.nav', ['selected' => ACCOUNT_PAYMENTS])
- {!! Former::open($url)->method($method)->rule()->addClass('warn-on-exit') !!}
- {!! Former::populateField('token_billing_type_id', $account->token_billing_type_id) !!}
-
+ @if(!$accountGateway && WEPAY_CLIENT_ID && !$account->getGatewayByType(PAYMENT_TYPE_CREDIT_CARD) && !$account->getGatewayByType(PAYMENT_TYPE_STRIPE))
+ @include('accounts.partials.account_gateway_wepay')
+ @endif
+