fix: currency code fields

avlyalin · Jul 27, 2020 · 42bb17b · 42bb17b
1 parent bd9c79a
commit 42bb17b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/database/factories/GooglePayPaymentFactory.php b/database/factories/GooglePayPaymentFactory.php
@@ -17,7 +17,7 @@
         'client_id' => Str::random(30),
         'ip' => $faker->ipv6,
         'amount' => $faker->numberBetween(),
-        'currency_code' => $faker->currencyCode,
+        'currency_code' => (string)$faker->numberBetween(100, 999),
         'email' => $faker->email,
         'phone' => $faker->phoneNumber,
         'return_url' => $faker->url,

diff --git a/database/factories/SamsungPayPaymentFactory.php b/database/factories/SamsungPayPaymentFactory.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Avlyalin\SberbankAcquiring\Models\AcquiringPayment;
 use Avlyalin\SberbankAcquiring\Models\SamsungPayPayment;
 use Illuminate\Support\Str;
 use Faker\Generator as Faker;
@@ -17,5 +16,6 @@
         'client_id' => Str::random(30),
         'ip' => $faker->ipv6,
         'payment_token' => Str::random(100),
+        'currency_code' => (string)$faker->numberBetween(100, 999),
     ];
 });
diff --git a/database/factories/SberbankPaymentFactory.php b/database/factories/SberbankPaymentFactory.php
@@ -11,7 +11,7 @@
     return [
         'order_number' => Str::random(32),
         'amount' => $faker->numberBetween(),
-        'currency' => $faker->currencyCode,
+        'currency' => $faker->numberBetween(100, 999),
         'return_url' => $faker->url,
         'fail_url' => $faker->url,
         'description' => $faker->sentence,

diff --git a/database/migrations/2020_06_29_175717_create_acquiring_samsung_pay_payments_table.php b/database/migrations/2020_06_29_175717_create_acquiring_samsung_pay_payments_table.php
@@ -31,6 +31,7 @@ public function up()
             $table->string('client_id', 255)->nullable()->comment('Номер (идентификатор) клиента в системе продавца');
             $table->string('ip', 39)->nullable()->comment('IP-адрес покупателя');
             $table->text('payment_token')->comment('Токен, полученный от Samsung Pay');
+            $table->string('currency_code', 3)->nullable()->comment('Цифровой код валюты платежа ISO 4217');
         });
     }
 

diff --git a/database/migrations/2020_06_29_175719_create_acquiring_google_pay_payments_table.php b/database/migrations/2020_06_29_175719_create_acquiring_google_pay_payments_table.php
@@ -31,7 +31,7 @@ public function up()
             $table->string('client_id', 255)->nullable()->comment('Номер (идентификатор) клиента в системе продавца');
             $table->string('ip', 39)->nullable()->comment('IP-адрес покупателя');
             $table->unsignedBigInteger('amount')->unsigned()->comment('Сумма платежа в минимальных единицах валюты');
-            $table->unsignedSmallInteger('currency_code')->nullable()->comment('Цифровой код валюты платежа ISO 4217');
+            $table->string('currency_code')->nullable()->comment('Цифровой код валюты платежа ISO 4217');
             $table->string('email')->nullable()->comment('Адрес электронной почты покупателя');
             $table->string('phone')->nullable()->comment('Номер телефона покупателя');
             $table->string('return_url', 512)->comment('Адрес для перехода в случае успешной оплаты');

diff --git a/src/Models/SamsungPayPayment.php b/src/Models/SamsungPayPayment.php
@@ -27,6 +27,7 @@ class SamsungPayPayment extends BasePaymentModel implements HasPaymentTokenInter
         'pre_auth',
         'client_id',
         'ip',
+        'currency_code',
     ];
 
     protected $casts = [
@@ -41,5 +42,6 @@ class SamsungPayPayment extends BasePaymentModel implements HasPaymentTokenInter
         'preAuth' => 'pre_auth',
         'clientId' => 'client_id',
         'ip' => 'ip',
+        'currencyCode' => 'currency_code',
     ];
 }