diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php index 21b165014c65..5459a83774a8 100644 --- a/app/Models/PaymentType.php +++ b/app/Models/PaymentType.php @@ -56,6 +56,7 @@ class PaymentType extends StaticModel const INSTANT_BANK_PAY = 45; const FPX = 46; const KLARNA = 47; + const Interac_E_Transfer = 48; public static function parseCardType($cardName) { diff --git a/app/Utils/Traits/Pdf/PDF.php b/app/Utils/Traits/Pdf/PDF.php index 21f41daf8273..f81407b9f9c0 100644 --- a/app/Utils/Traits/Pdf/PDF.php +++ b/app/Utils/Traits/Pdf/PDF.php @@ -21,9 +21,11 @@ class PDF extends FPDI { $this->SetXY(0, -5); $this->SetFont('Arial', 'I', 9); + $this->SetTextColor(135, 135, 135); $trans = ctrans('texts.pdf_page_info', ['current' => $this->PageNo(), 'total' => '{nb}']); + $trans = iconv('UTF-8', 'ISO-8859-7', $trans); $this->Cell(0, 5, $trans, 0, 0, $this->text_alignment); } diff --git a/database/migrations/2022_05_12_56879_add_stripe_klarna.php b/database/migrations/2022_05_12_56879_add_stripe_klarna.php index 969553634d52..e85e0e733879 100644 --- a/database/migrations/2022_05_12_56879_add_stripe_klarna.php +++ b/database/migrations/2022_05_12_56879_add_stripe_klarna.php @@ -14,21 +14,37 @@ return new class extends Migration { */ public function up() { - Schema::table('payment_types', function (Blueprint $table) { - $type = new PaymentType(); + $pt = PaymentType::find(47); + if(!$pt) + { + $type = new PaymentType(); $type->id = 47; $type->name = 'Klarna'; $type->gateway_type_id = GatewayType::KLARNA; - $type->save(); - }); - $type = new GatewayType(); + } - $type->id = 23; - $type->alias = 'klarna'; - $type->name = 'Klarna'; - $type->save(); + $pt = PaymentType::find(48); + + if(!$pt) + { + $type = new PaymentType(); + $type->id = 48; + $type->name = 'Interac E-Transfer'; + $type->save(); + } + + $gt = GatewayType::find(23); + + if(!$gt) + { + $type = new GatewayType(); + $type->id = 23; + $type->alias = 'klarna'; + $type->name = 'Klarna'; + $type->save(); + } } }; diff --git a/database/migrations/2022_07_12_45766_add_matomo.php b/database/migrations/2022_07_12_45766_add_matomo.php index 5df323980c73..6eb354c2784a 100644 --- a/database/migrations/2022_07_12_45766_add_matomo.php +++ b/database/migrations/2022_07_12_45766_add_matomo.php @@ -17,5 +17,6 @@ return new class extends Migration $table->string('matomo_url',191)->nullable(); $table->bigInteger('matomo_id')->nullable(); }); + } }; \ No newline at end of file diff --git a/lang/en/texts.php b/lang/en/texts.php index 82480c63daf9..e15dd9f6cf23 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -4891,7 +4891,7 @@ $LANG = array( 'restored_transaction_rule' => 'Successfully restored transaction rule', 'search_transaction_rule' => 'Search Transaction Rule', 'search_transaction_rules' => 'Search Transaction Rules', - + 'payment_type_Interac E-Transfer' => 'Interac E-Transfer', ); return $LANG;