PAymentMode enum

Author: Al-Muhandis

tests/test_yookassa_api.pas

@@ -314,7 +314,7 @@ procedure TTestYooKassa.TestReceiptItemToJSON;
     aItem.AmountValue := 150.00;
     aItem.AmountCurrency := 'RUB';
     aItem.VatCode := 1;
-    aItem.PaymentMode := 'full_prepayment';
+    aItem.PaymentMode := pmFullPrepayment;
     aItem.PaymentSubject := 'commodity';
     aItem.Measure := 'piece';
 

tests/test_yookassa_api_integration.pas

@@ -126,7 +126,7 @@ class procedure TTestYooKassaIntegration.UpdateTestReceipt(TestReceipt: TYookass
     aItem.AmountValue := aAmount;
     aItem.AmountCurrency := aCurrency;
     aItem.VatCode := 1;
-    aItem.PaymentMode := 'full_prepayment';
+    aItem.PaymentMode := pmFullPrepayment;
     aItem.PaymentSubject := 'property_right';
 
     aItem.Supplier.Name := 'Иванов И.П.';
@@ -263,7 +263,7 @@ procedure TTestYooKassaIntegration.TestCreatePaymentWithReceipt_Sandbox;
   aItem.AmountValue := FPaymentRequest.Amount;
   aItem.AmountCurrency := FPaymentRequest.Currency;
   aItem.VatCode := 1;
-  aItem.PaymentMode := 'full_prepayment';
+  aItem.PaymentMode := pmFullPrepayment;
   aItem.PaymentSubject := 'commodity';
   aReceipt.AddItem(aItem);
 
@@ -356,7 +356,7 @@ procedure TTestYooKassaIntegration.TestCreateReceiptWithMarkCode_Sandbox;
   aItem.AmountValue := 200.00;
   aItem.AmountCurrency := 'RUB';
   aItem.VatCode := 2; // НДС 10%
-  aItem.PaymentMode := 'full_prepayment';
+  aItem.PaymentMode := pmFullPrepayment;
   aItem.PaymentSubject := 'commodity';
   aItem.MarkMode := 1; // The product is subject to labeling
   aItem.MarkCodeInfo := 'VGVzdE1hcmtDb2RlMTIzNDU2Nzg5MA=='; // Base64 test code
@@ -407,7 +407,7 @@ procedure TTestYooKassaIntegration.TestReceiptAfterPayment_Agent_Sandbox;
       aItem.AmountValue := FPaymentRequest.Amount;
       aItem.AmountCurrency := FPaymentRequest.Currency;
       aItem.VatCode := 1; // НДС 18%
-      aItem.PaymentMode := 'full_prepayment';
+      aItem.PaymentMode := pmFullPrepayment;
       aItem.PaymentSubject := 'commodity';
 
       // supplier

yookassa_api.pas

@@ -109,10 +109,18 @@   TYookassaSupplier = class(TYookassaAPIObject)
     atAgent                 // agent
   );
 
+  { Признак способа расчета передается в параметре payment_mode }
+  TPaymentMode = (
+    pmNone,
+    pmFullPrepayment,   // Полная предоплата
+    pmFullPayment       // Полный расчет
+  );
+
   { TYookassaReceiptItem }
   TYookassaReceiptItem = class(TYookassaAPIObject)
   private
     FAgentType: TYookassaAgentType;
+    FPaymentMode: TPaymentMode;
     FSupplier: TYookassaSupplier;
     function GetAgentTypeString: string;
     function GetSupplier: TYookassaSupplier;
@@ -122,15 +130,15 @@   TYookassaReceiptItem = class(TYookassaAPIObject)
     AmountValue: Currency;
     AmountCurrency: string;
     VatCode: Integer;
-    PaymentMode: string;
     PaymentSubject: string;
     MarkMode: Integer;
     MarkCodeInfo: string; // base64 gs_1m,
     Measure: string;
     constructor Create;
     destructor Destroy; override;
     function ToJSON: TJSONObject; override;
-    property AgentType: TYookassaAgentType read FAgentType write FAgentType;
+    property AgentType: TYookassaAgentType read FAgentType write FAgentType; 
+    property PaymentMode: TPaymentMode read FPaymentMode write FPaymentMode;
     property Supplier: TYookassaSupplier read GetSupplier;
   end;
 
@@ -310,6 +318,16 @@ function ReceiptTypeToString(aType: TReceiptType): String;
   end;
 end;
 
+function PaymentModeToString(aPaymentMode: TPaymentMode): String;
+begin
+  case aPaymentMode of
+    pmFullPrepayment: Result:='full_prepayment';
+    pmFullPayment:    Result:='full_payment';
+  else
+    Result:=EmptyStr;
+  end;
+end;
+
 { TYookassaResponse }
 
 constructor TYookassaResponse.Create(ARaw: TJSONObject);
@@ -574,7 +592,7 @@ function TYookassaReceiptItem.ToJSON: TJSONObject;
     aAmount.Add('currency', AmountCurrency);
     Result.Add('amount', aAmount);
     Result.Add('vat_code', VatCode);
-    if PaymentMode <> EmptyStr then Result.Add('payment_mode', PaymentMode);
+    if FPaymentMode <> pmNone then Result.Add('payment_mode', PaymentModeToString(FPaymentMode));
     if PaymentSubject <> EmptyStr then Result.Add('payment_subject', PaymentSubject);
     if MarkMode >= 0 then
     begin