chore: update SDK from api-definitions (#674)

* update SDK from api-definitions * Fix example --------- Co-authored-by: rebilly-machine-user <[email protected]> Co-authored-by: Alexander Shkarpetin <[email protected]>
Rebilly · Mar 12, 2024 · 5023da8 · 5023da8
1 parent 7df34fc
commit 5023da8
Show file tree

Hide file tree

Showing 26 changed files with 879 additions and 131 deletions.
diff --git a/.changeset/flat-items-tease.md b/.changeset/flat-items-tease.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+Remove unused upcoming invoice fields Rebilly/api-definitions#1823
diff --git a/.changeset/giant-books-do.md b/.changeset/giant-books-do.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+Add setting to CoinGate to adjust amount Rebilly/api-definitions#1822
diff --git a/.changeset/purple-horses-act.md b/.changeset/purple-horses-act.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+Add Trial conversion quote in Storefront change order items Rebilly/api-definitions#1820
diff --git a/.changeset/silver-chefs-dream.md b/.changeset/silver-chefs-dream.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+SDK Generator updated
diff --git a/.changeset/ten-geckos-occur.md b/.changeset/ten-geckos-occur.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+Add depositRequestId to storefront transaction Rebilly/api-definitions#1767
diff --git a/.changeset/wise-glasses-cover.md b/.changeset/wise-glasses-cover.md
@@ -0,0 +1,5 @@
+---
+"@rebilly/client-php": patch
+---
+
+Refactor subscriptions related files Rebilly/api-definitions#1734
diff --git a/examples/purchase.php b/examples/purchase.php
@@ -14,16 +14,16 @@
 use Rebilly\Sdk\Exception\DataValidationException;
 use Rebilly\Sdk\Model\ContactObject;
 use Rebilly\Sdk\Model\Customer;
-use Rebilly\Sdk\Model\OrderItem;
-use Rebilly\Sdk\Model\OrderItemPlan;
 use Rebilly\Sdk\Model\PaymentCardToken;
 use Rebilly\Sdk\Model\PaymentInstructionToken;
 use Rebilly\Sdk\Model\Plan;
 use Rebilly\Sdk\Model\PlanFormulaFlatRate;
 use Rebilly\Sdk\Model\PostTransactionRequest;
 use Rebilly\Sdk\Model\Product;
 use Rebilly\Sdk\Model\Subscription;
-use Rebilly\Sdk\Model\SubscriptionOrderPlanRecurringInterval;
+use Rebilly\Sdk\Model\SubscriptionOrOneTimeSaleItem;
+use Rebilly\Sdk\Model\SubscriptionOrOneTimeSaleItemPlan;
+use Rebilly\Sdk\Model\SubscriptionPlanRecurringInterval;
 use Rebilly\Sdk\Model\Website;
 use Rebilly\Sdk\UsersService;
 
@@ -96,8 +96,8 @@ function printEntity(mixed $entity): void
                 ->setPrice(9.99),
         )
         ->setRecurringInterval(
-            SubscriptionOrderPlanRecurringInterval::from()
-                ->setUnit(SubscriptionOrderPlanRecurringInterval::UNIT_MONTH)
+            SubscriptionPlanRecurringInterval::from()
+                ->setUnit(SubscriptionPlanRecurringInterval::UNIT_MONTH)
                 ->setLength(1),
         );
 
@@ -114,9 +114,9 @@ function printEntity(mixed $entity): void
         ->setWebsiteId($websiteId)
         ->setCustomerId($customer->getId())
         ->setItems([
-            OrderItem::from()
+            SubscriptionOrOneTimeSaleItem::from()
                 ->setPlan(
-                    OrderItemPlan::from()
+                    SubscriptionOrOneTimeSaleItemPlan::from()
                         ->setId($plan->getId())
                 )
             ->setQuantity(1),

diff --git a/src/Api/SubscriptionsApi.php b/src/Api/SubscriptionsApi.php
@@ -19,13 +19,13 @@
 use Rebilly\Sdk\Collection;
 use Rebilly\Sdk\Model\Invoice;
 use Rebilly\Sdk\Model\InvoiceIssue;
-use Rebilly\Sdk\Model\OrderItem;
 use Rebilly\Sdk\Model\OrderTimeline;
 use Rebilly\Sdk\Model\SubscriptionChange;
 use Rebilly\Sdk\Model\SubscriptionInvoice;
 use Rebilly\Sdk\Model\SubscriptionItemUpdate;
 use Rebilly\Sdk\Model\SubscriptionOrOneTimeSale;
 use Rebilly\Sdk\Model\SubscriptionOrOneTimeSaleFactory;
+use Rebilly\Sdk\Model\SubscriptionOrOneTimeSaleItem;
 use Rebilly\Sdk\Model\SubscriptionSummaryMetrics;
 use Rebilly\Sdk\Model\UpcomingInvoice;
 use Rebilly\Sdk\Paginator;
@@ -438,13 +438,13 @@ public function update(
     }
 
     /**
-     * @return OrderItem
+     * @return SubscriptionOrOneTimeSaleItem
      */
     public function updateItem(
         string $id,
         string $itemId,
         SubscriptionItemUpdate $subscriptionItemUpdate,
-    ): OrderItem {
+    ): SubscriptionOrOneTimeSaleItem {
         $pathParams = [
             '{id}' => $id,
             '{itemId}' => $itemId,
@@ -456,7 +456,7 @@ public function updateItem(
         $response = $this->client->send($request);
         $data = Utils::jsonDecode((string) $response->getBody(), true);
 
-        return OrderItem::from($data);
+        return SubscriptionOrOneTimeSaleItem::from($data);
     }
 
     /**

diff --git a/src/Model/CoinGateSettings.php b/src/Model/CoinGateSettings.php
@@ -27,6 +27,9 @@ public function __construct(array $data = [])
         if (array_key_exists('tolerancePercentage', $data)) {
             $this->setTolerancePercentage($data['tolerancePercentage']);
         }
+        if (array_key_exists('adjustAmount', $data)) {
+            $this->setAdjustAmount($data['adjustAmount']);
+        }
     }
 
     public static function from(array $data = []): self
@@ -58,6 +61,18 @@ public function setTolerancePercentage(null|int $tolerancePercentage): static
         return $this;
     }
 
+    public function getAdjustAmount(): ?bool
+    {
+        return $this->fields['adjustAmount'] ?? null;
+    }
+
+    public function setAdjustAmount(null|bool $adjustAmount): static
+    {
+        $this->fields['adjustAmount'] = $adjustAmount;
+
+        return $this;
+    }
+
     public function jsonSerialize(): array
     {
         $data = [];
@@ -67,6 +82,9 @@ public function jsonSerialize(): array
         if (array_key_exists('tolerancePercentage', $this->fields)) {
             $data['tolerancePercentage'] = $this->fields['tolerancePercentage'];
         }
+        if (array_key_exists('adjustAmount', $this->fields)) {
+            $data['adjustAmount'] = $this->fields['adjustAmount'];
+        }
 
         return $data;
     }

diff --git a/src/Model/FlexiblePlan.php b/src/Model/FlexiblePlan.php
@@ -272,15 +272,15 @@ public function getLinks(): ?array
         return $this->fields['_links'] ?? null;
     }
 
-    public function getRecurringInterval(): SubscriptionOrderPlanRecurringInterval
+    public function getRecurringInterval(): SubscriptionPlanRecurringInterval
     {
         return $this->fields['recurringInterval'];
     }
 
-    public function setRecurringInterval(SubscriptionOrderPlanRecurringInterval|array $recurringInterval): static
+    public function setRecurringInterval(SubscriptionPlanRecurringInterval|array $recurringInterval): static
     {
-        if (!($recurringInterval instanceof SubscriptionOrderPlanRecurringInterval)) {
-            $recurringInterval = SubscriptionOrderPlanRecurringInterval::from($recurringInterval);
+        if (!($recurringInterval instanceof SubscriptionPlanRecurringInterval)) {
+            $recurringInterval = SubscriptionPlanRecurringInterval::from($recurringInterval);
         }
 
         $this->fields['recurringInterval'] = $recurringInterval;
@@ -304,15 +304,15 @@ public function setTrial(TrialOnlyPlanTrial|array $trial): static
         return $this;
     }
 
-    public function getMeteredBilling(): ?SubscriptionOrderPlanMeteredBilling
+    public function getMeteredBilling(): ?SubscriptionPlanMeteredBilling
     {
         return $this->fields['meteredBilling'] ?? null;
     }
 
-    public function setMeteredBilling(null|SubscriptionOrderPlanMeteredBilling|array $meteredBilling): static
+    public function setMeteredBilling(null|SubscriptionPlanMeteredBilling|array $meteredBilling): static
     {
-        if ($meteredBilling !== null && !($meteredBilling instanceof SubscriptionOrderPlanMeteredBilling)) {
-            $meteredBilling = SubscriptionOrderPlanMeteredBilling::from($meteredBilling);
+        if ($meteredBilling !== null && !($meteredBilling instanceof SubscriptionPlanMeteredBilling)) {
+            $meteredBilling = SubscriptionPlanMeteredBilling::from($meteredBilling);
         }
 
         $this->fields['meteredBilling'] = $meteredBilling;

diff --git a/src/Model/OneTimeSale.php b/src/Model/OneTimeSale.php
@@ -321,20 +321,20 @@ public function getRecentInvoiceId(): ?string
     }
 
     /**
-     * @return OrderItem[]
+     * @return SubscriptionOrOneTimeSaleItem[]
      */
     public function getItems(): array
     {
         return $this->fields['items'];
     }
 
     /**
-     * @param array[]|OrderItem[] $items
+     * @param array[]|SubscriptionOrOneTimeSaleItem[] $items
      */
     public function setItems(array $items): static
     {
         $items = array_map(
-            fn ($value) => $value instanceof OrderItem ? $value : OrderItem::from($value),
+            fn ($value) => $value instanceof SubscriptionOrOneTimeSaleItem ? $value : SubscriptionOrOneTimeSaleItem::from($value),
             $items,
         );
 

diff --git a/src/Model/Plan.php b/src/Model/Plan.php
@@ -265,15 +265,15 @@ public function getLinks(): ?array
         return $this->fields['_links'] ?? null;
     }
 
-    public function getRecurringInterval(): SubscriptionOrderPlanRecurringInterval
+    public function getRecurringInterval(): SubscriptionPlanRecurringInterval
     {
         return $this->fields['recurringInterval'];
     }
 
-    public function setRecurringInterval(SubscriptionOrderPlanRecurringInterval|array $recurringInterval): static
+    public function setRecurringInterval(SubscriptionPlanRecurringInterval|array $recurringInterval): static
     {
-        if (!($recurringInterval instanceof SubscriptionOrderPlanRecurringInterval)) {
-            $recurringInterval = SubscriptionOrderPlanRecurringInterval::from($recurringInterval);
+        if (!($recurringInterval instanceof SubscriptionPlanRecurringInterval)) {
+            $recurringInterval = SubscriptionPlanRecurringInterval::from($recurringInterval);
         }
 
         $this->fields['recurringInterval'] = $recurringInterval;
@@ -297,15 +297,15 @@ public function setTrial(TrialOnlyPlanTrial|array $trial): static
         return $this;
     }
 
-    public function getMeteredBilling(): ?SubscriptionOrderPlanMeteredBilling
+    public function getMeteredBilling(): ?SubscriptionPlanMeteredBilling
     {
         return $this->fields['meteredBilling'] ?? null;
     }
 
-    public function setMeteredBilling(null|SubscriptionOrderPlanMeteredBilling|array $meteredBilling): static
+    public function setMeteredBilling(null|SubscriptionPlanMeteredBilling|array $meteredBilling): static
     {
-        if ($meteredBilling !== null && !($meteredBilling instanceof SubscriptionOrderPlanMeteredBilling)) {
-            $meteredBilling = SubscriptionOrderPlanMeteredBilling::from($meteredBilling);
+        if ($meteredBilling !== null && !($meteredBilling instanceof SubscriptionPlanMeteredBilling)) {
+            $meteredBilling = SubscriptionPlanMeteredBilling::from($meteredBilling);
         }
 
         $this->fields['meteredBilling'] = $meteredBilling;

diff --git a/src/Model/QuoteFactory.php b/src/Model/QuoteFactory.php
@@ -23,6 +23,7 @@ public static function from(array $data = []): Quote
             'change' => QuoteChangeOrder::from($data),
             'create' => QuoteCreateOrder::from($data),
             'reactivate' => QuoteReactivateOrder::from($data),
+            'trial-conversion' => QuoteTrialConversionOrder::from($data),
             default => throw new UnknownDiscriminatorValueException(),
         };
     }