From f28e536325f6deb944fa2101c02790a7b79fbfa3 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 23 Apr 2014 15:47:44 +0300 Subject: [PATCH] Bug fixes --- app/database/seeds/PaymentLibrariesSeeder.php | 14 +++++++------- app/lang/de/texts.php | 4 ++-- app/lang/en/texts.php | 2 +- app/lang/es/texts.php | 4 ++-- app/lang/fr/texts.php | 4 ++-- app/lang/it/texts.php | 2 +- app/lang/nl/texts.php | 1 + app/lang/pt_BR/texts.php | 2 ++ app/views/invoices/edit.blade.php | 6 ++++-- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/database/seeds/PaymentLibrariesSeeder.php b/app/database/seeds/PaymentLibrariesSeeder.php index d9fcc428784d..07bb1e63be02 100644 --- a/app/database/seeds/PaymentLibrariesSeeder.php +++ b/app/database/seeds/PaymentLibrariesSeeder.php @@ -14,9 +14,9 @@ class PaymentLibrariesSeeder extends Seeder $updateProviders = array( 0 => 'AuthorizeNet_AIM', - 1 => 'BeanStream', - 2 => 'iTransact', - 3 => 'FirstData_Connect', + //1 => 'BeanStream', + //2 => 'iTransact', + //3 => 'FirstData_Connect', 4 => 'PayPal_Pro', 5 => 'TwoCheckout' ); @@ -28,10 +28,10 @@ class PaymentLibrariesSeeder extends Seeder Gateway::whereIn('provider', $updateProviders)->update(array('recommended' => 1)); - Gateway::where('provider', '=', 'AuthorizeNet_AIM')->update(array('sort_order' => 5, 'site_url' => 'http://www.authorize.net/')); - Gateway::where('provider', '=', 'BeanStream')->update(array('sort_order' => 10, 'site_url' => 'http://www.beanstream.com/')); - Gateway::where('provider', '=', 'FirstData_Connect')->update(array('sort_order' => 20, 'site_url' => 'https://www.firstdata.com/')); + Gateway::where('provider', '=', 'AuthorizeNet_AIM')->update(array('sort_order' => 5, 'site_url' => 'http://reseller.authorize.net/application/?id=5560364')); + //Gateway::where('provider', '=', 'BeanStream')->update(array('sort_order' => 10, 'site_url' => 'http://www.beanstream.com/')); + //Gateway::where('provider', '=', 'FirstData_Connect')->update(array('sort_order' => 20, 'site_url' => 'https://www.firstdata.com/')); Gateway::where('provider', '=', 'PayPal_Pro')->update(array('sort_order' => 25, 'site_url' => 'https://www.paypal.com/')); - Gateway::where('provider', '=', 'TwoCheckout')->update(array('sort_order' => 30, 'site_url' => 'https://www.2checkout.com/')); + Gateway::where('provider', '=', 'TwoCheckout')->update(array('sort_order' => 30, 'site_url' => 'https://www.2checkout.com/referral?r=2c37ac2298')); } } \ No newline at end of file diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index 5f6c98f50465..c47f564d5d1c 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -317,6 +317,6 @@ return array( 'field_label' => 'Field Label', 'field_value' => 'Field Value', 'edit' => 'Edit', - 'view_invoice' => 'View invoice', - + 'view_as_recipient' => 'View as recipient', + ); diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index edfa403453b8..feb37ad86f35 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -324,7 +324,7 @@ return array( 'field_value' => 'Field Value', 'edit' => 'Edit', 'set_name' => 'Set your company name', - 'view_invoice' => 'View invoice', + 'view_as_recipient' => 'View as recipient', diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index 416420c15164..8491cd362b91 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -316,6 +316,6 @@ return array( 'field_label' => 'Field Label', 'field_value' => 'Field Value', 'edit' => 'Edit', - 'view_invoice' => 'View invoice', - + 'view_as_recipient' => 'View as recipient', + ); diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index 350485881be4..f205699f5825 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -317,6 +317,6 @@ return array( 'field_label' => 'Field Label', 'field_value' => 'Field Value', 'edit' => 'Edit', - 'view_invoice' => 'View invoice', - + 'view_as_recipient' => 'View as recipient', + ); diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index d179fa9d0514..7fbe922fdc70 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -317,6 +317,6 @@ return array( 'field_label' => 'Field Label', 'field_value' => 'Field Value', 'edit' => 'Edit', - 'view_invoice' => 'View invoice', + 'view_as_recipient' => 'View as recipient', ); diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index 263e2c86ded7..7889730e9582 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -318,5 +318,6 @@ return array( 'field_value' => 'Field Value', 'edit' => 'Edit', 'view_invoice' => 'View invoice', + 'view_as_recipient' => 'View as recipient', ); diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index 75e8c6360f4a..e59ea9fbbafb 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -306,5 +306,7 @@ return array( 'field_value' => 'Field Value', 'edit' => 'Edit', 'view_invoice' => 'View invoice', + 'view_as_recipient' => 'View as recipient', + ); diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index b04f3953ec02..c9960c217ba5 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -275,7 +275,9 @@ @if (!Auth::user()->account->isPro()) - {{ trans('texts.pro_plan.remove_logo', ['link'=>''.trans('texts.pro_plan.remove_logo_link').'']) }} +
+ {{ trans('texts.pro_plan.remove_logo', ['link'=>''.trans('texts.pro_plan.remove_logo_link').'']) }} +
@endif