Merge pull request #128 from ndeet/cleanup

Cleanup and adding getCurrency() for new data field.

src/Result/InvoicePaymentMethod.php

@@ -73,10 +73,6 @@ public function getPaymentMethod(): string
     public function getCryptoCode(): string
     {
         $data = $this->getData();
-        // BTCPay 2.0.0 compatibility: cryptoCode was renamed to currency.
-        if (isset($data['currency'])) {
-            return $data['currency'];
-        }
 
         // For future compatibility check if cryptoCode exists.
         if (isset($data['cryptoCode'])) {
@@ -87,4 +83,13 @@ public function getCryptoCode(): string
             return $parts[0];
         }
     }
+
+    /**
+     * New field as of BTCPay 2.0.0.
+     */
+    public function getCurrency(): ?string
+    {
+        $data = $this->getData();
+        return $data['currency'] ?? null;
+    }
 }

src/Result/StorePaymentMethodCollection.php

@@ -42,7 +42,7 @@ public function all(): array
                     $paymentMethodData['cryptoCode'] = str_replace('-LightningNetwork', '', $paymentMethod);
                 }
 
-                // BTCPay 2.0 compatibility: put the currency code in the cryptoCode field.
+                // BTCPay 2.0 compatibility: put the extracted cryptoCode in the cryptoCode field.
                 if (isset($extractedCryptoCode)) {
                     $paymentMethodData['cryptoCode'] = $extractedCryptoCode;
                 }