fix getPaymentParameters return type

igor-netFantom · Jun 15, 2023 · f0d5a4f · f0d5a4f
1 parent ebcbb84
commit f0d5a4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Options/InvoiceOptions.php b/src/Options/InvoiceOptions.php
@@ -9,7 +9,7 @@
 class InvoiceOptions
 {
     public readonly string $outSum;
-    public readonly string|null|DateTime $expirationDate;
+    public readonly string|null $expirationDate;
 
     /**
      * @param float|string $outSum Требуемая к получению сумма

diff --git a/src/RobokassaApi.php b/src/RobokassaApi.php
@@ -130,6 +130,9 @@ public function generateSignatureForPayment(InvoiceOptions $invoiceOptions): str
      * то есть в GET запросе поле Receipt должно кодироваться дважды - urlencode(urlencode($Receipt)),
      * но в их демо магазине оно дополнительно **не закодировано и работает без этого**. Данный момент требует тщательной проверки.
      * {@link https://docs.robokassa.ru/fiscalization/}
+     * @param InvoiceOptions $invoiceOptions
+     * @return array<string, null|string>
+     * @throws JsonException
      */
     public function getPaymentParameters(InvoiceOptions $invoiceOptions): array
     {
@@ -139,15 +142,15 @@ public function getPaymentParameters(InvoiceOptions $invoiceOptions): array
             'Description' => $invoiceOptions->description,
             'SignatureValue' => $invoiceOptions->signatureValue ?? $this->generateSignatureForPayment($invoiceOptions),
             'IncCurrLabel' => $invoiceOptions->incCurrLabel,
-            'InvId' => $invoiceOptions->invId,
+            'InvId' => isset($invoiceOptions->invId) ? (string)$invoiceOptions->invId : null,
             'Culture' => $invoiceOptions->culture?->value,
             'Encoding' => $invoiceOptions->encoding,
             'Email' => $invoiceOptions->email,
             'ExpirationDate' => $invoiceOptions->expirationDate,
             'OutSumCurrency' => $invoiceOptions->outSumCurrency?->value,
             'UserIp' => $invoiceOptions->userIP,
             'Receipt' => self::getEncodedReceipt($invoiceOptions),
-            'IsTest' => $this->isTest ? 1 : null,
+            'IsTest' => $this->isTest ? '1' : null,
             ...$invoiceOptions->getFormattedUserParameters()
         ];
     }