Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 09:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for gateway

Browse Source
This commit is contained in:
David Bomba 2020-10-09 22:13:33 +11:00
parent 44d31ce326
commit 9187946760
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/DataMapper/EmailTemplateDefaults.php
View File

@ -34,7 +34,7 @@ class EmailTemplateDefaults
return self::emailPaymentTemplate(); return self::emailPaymentTemplate();
break; break;
case 'email_template_payment_partial': case 'email_template_payment_partial':
return self::emailPaymentTemplate(); return self::emailPaymentPartialTemplate();
break; break;
case 'email_template_statement': case 'email_template_statement':
return self::emailStatementTemplate(); return self::emailStatementTemplate();
@ -73,7 +73,7 @@ class EmailTemplateDefaults
return self::emailPaymentSubject(); return self::emailPaymentSubject();
break; break;
case 'email_subject_payment_partial': case 'email_subject_payment_partial':
return self::emailPaymentSubject(); return self::emailPaymentPartialSubject();
break; break;
case 'email_subject_statement': case 'email_subject_statement':
return self::emailStatementSubject(); return self::emailStatementSubject();
@ -140,13 +140,11 @@ class EmailTemplateDefaults
]); ]);
return $converter->convertToHtml(self::transformText('quote_message')); return $converter->convertToHtml(self::transformText('quote_message'));
//return Parsedown::instance()->line(self::transformText('quote_message'));
} }
public static function emailPaymentSubject() public static function emailPaymentSubject()
{ {
return ctrans('texts.payment_subject'); return ctrans('texts.payment_subject');
//return Parsedown::instance()->line(self::transformText('payment_subject'));
} }
public static function emailPaymentTemplate() public static function emailPaymentTemplate()
@ -158,7 +156,11 @@ class EmailTemplateDefaults
return $converter->convertToHtml(self::transformText('payment_message')); return $converter->convertToHtml(self::transformText('payment_message'));
// return Parsedown::instance()->line(self::transformText('payment_message')); }
public static function emailPaymentPartialSubject()
{
return ctrans('texts.payment_subject');
} }
public static function emailReminder1Subject() public static function emailReminder1Subject()

2
app/Models/Gateway.php
View File

@ -100,7 +100,7 @@ class Gateway extends StaticModel
* Returns an array of methods and the gatewaytypes possible * Returns an array of methods and the gatewaytypes possible
* *
* @return array * @return array
*/ *///todo remove methods replace with gatewaytype:: and then nest refund / token billing
public function getMethods() public function getMethods()
{ {
switch ($this->id) { switch ($this->id) {

2
app/Utils/HtmlEngine.php
View File

@ -121,7 +121,7 @@ class HtmlEngine
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')]; $data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
$data['$terms'] = &$data['$entity.terms']; $data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => '<a href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')]; $data['$view_link'] = ['value' => '<a href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
// $data['$view_link'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')]; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
} }
if ($this->entity_string == 'quote') { if ($this->entity_string == 'quote') {

7
composer.json
View File

@ -64,16 +64,17 @@
"laravel/ui": "^3.0" "laravel/ui": "^3.0"
}, },
"require-dev": { "require-dev": {
"wildbit/postmark-php": "^4.0",
"anahkiasen/former": "^4.2", "anahkiasen/former": "^4.2",
"barryvdh/laravel-debugbar": "^3.4", "barryvdh/laravel-debugbar": "^3.4",
"brianium/paratest": "^5.0",
"darkaonline/l5-swagger": "^8.0", "darkaonline/l5-swagger": "^8.0",
"facade/ignition": "^2.3.6",
"filp/whoops": "^2.7", "filp/whoops": "^2.7",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1", "mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0", "nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0", "phpunit/phpunit": "^9.0",
"fzaninotto/faker": "^1.9.1", "wildbit/postmark-php": "^4.0"
"facade/ignition": "^2.3.6"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
cypress.json
View File

@ -1,5 +1,5 @@
{ {
"video": false, "video": false,
"baseUrl": "http://invoiceninja.wip/", "baseUrl": "http://ninja.test:8000/",
"chromeWebSecurity": false "chromeWebSecurity": false
} }