Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Hillel Coren 2014-04-23 16:02:29 +03:00
commit a4f7789e97
9 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/database/seeds/PaymentLibrariesSeeder.php
View File

@ -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'));
}
}

4
app/lang/de/texts.php
View File

@ -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',
);

2
app/lang/en/texts.php
View File

@ -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',

4
app/lang/es/texts.php
View File

@ -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',
);

4
app/lang/fr/texts.php
View File

@ -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',
);

2
app/lang/it/texts.php
View File

@ -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',
);

1
app/lang/nl/texts.php
View File

@ -318,5 +318,6 @@ return array(
'field_value' => 'Field Value',
'edit' => 'Edit',
'view_invoice' => 'View invoice',
'view_as_recipient' => 'View as recipient',
);

2
app/lang/pt_BR/texts.php
View File

@ -306,5 +306,7 @@ return array(
'field_value' => 'Field Value',
'edit' => 'Edit',
'view_invoice' => 'View invoice',
'view_as_recipient' => 'View as recipient',
);

6
app/views/invoices/edit.blade.php
View File

@ -275,7 +275,9 @@
<canvas id="theCanvas" style="display:none;width:100%;border:solid 1px #CCCCCC;"></canvas>
@if (!Auth::user()->account->isPro())
{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
<div style="font-size:larger">
{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
</div>
@endif
<div class="modal fade" id="clientModal" tabindex="-1" role="dialog" aria-labelledby="clientModalLabel" aria-hidden="true">
@ -1256,7 +1258,7 @@
@if (Utils::isConfirmed())
if (self.invitation_link()) {
str += '<br/><a href="' + self.invitation_link() + '" target="_blank">{{ trans('texts.view_invoice') }}</a>';
str += '<br/><a href="' + self.invitation_link() + '" target="_blank">{{ trans('texts.view_as_recipient') }}</a>';
}
@endif