Merge branch 'main' into error-handler

Shopify · Apr 8, 2024 · 32e249e · 32e249e
2 parents c0da66a + 35ec8f8
commit 32e249e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 42 deletions.
diff --git a/.changeset/young-hotels-agree.md b/.changeset/young-hotels-agree.md
@@ -0,0 +1,5 @@
+---
+"@shopify/shopify-api": patch
+---
+
+Fixed an issue with the `RecurringApplicationCharge` REST resource currency type
diff --git a/packages/shopify-api/rest/admin/2022-10/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2022-10/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.October22;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2023-01/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2023-01/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.January23;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2023-04/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2023-04/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.April23;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2023-07/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2023-07/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.July23;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2023-10/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2023-10/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.October23;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2024-01/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2024-01/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.January24;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;

diff --git a/packages/shopify-api/rest/admin/2024-04/recurring_application_charge.ts b/packages/shopify-api/rest/admin/2024-04/recurring_application_charge.ts
@@ -7,8 +7,6 @@ import {ResourcePath, ResourceNames} from '../../types';
 import {Session} from '../../../lib/session/session';
 import {ApiVersion} from '../../../lib/types';
 
-import {Currency} from './currency';
-
 interface FindArgs {
   session: Session;
   id: number | string;
@@ -32,9 +30,7 @@ interface CustomizeArgs {
 export class RecurringApplicationCharge extends Base {
   public static apiVersion = ApiVersion.April24;
 
-  protected static hasOne: {[key: string]: typeof Base} = {
-    "currency": Currency
-  };
+  protected static hasOne: {[key: string]: typeof Base} = {};
   protected static hasMany: {[key: string]: typeof Base} = {};
   protected static paths: ResourcePath[] = [
     {"http_method": "delete", "operation": "delete", "ids": ["id"], "path": "recurring_application_charges/<id>.json"},
@@ -124,7 +120,7 @@ export class RecurringApplicationCharge extends Base {
   public capped_amount: string | number | null;
   public confirmation_url: string | null;
   public created_at: string | null;
-  public currency: Currency | null | {[key: string]: any};
+  public currency: string | null;
   public id: number | null;
   public name: string | null;
   public price: string | number | null;