Skip to content

Commit a64f7dd

Browse files
authored
Merge pull request #1320 from Shopify/liz/update-tax-shipping-type
Update the shop.tax_shipping type
2 parents 661a8de + d1f442b commit a64f7dd

File tree

10 files changed

+19
-18
lines changed

10 files changed

+19
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Note: For changes to the API, see https://shopify.dev/changelog?filter=api
44

55
## Unreleased
6+
- [#1320](https://github.com/Shopify/shopify-api-ruby/pull/1320) Fix sorbet type on Shop.tax_shipping field
67

78
## 14.3.0
89
- [#1312](https://github.com/Shopify/shopify-api-ruby/pull/1312) Use same leeway for `exp` and `nbf` when parsing JWT

lib/shopify_api/rest/resources/2022_04/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2022_07/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2022_10/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2023_01/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2023_04/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2023_07/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2023_10/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2024_01/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

lib/shopify_api/rest/resources/2024_04/shop.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
6666
@setup_required = T.let(nil, T.nilable(T::Boolean))
6767
@shop_owner = T.let(nil, T.nilable(String))
6868
@source = T.let(nil, T.nilable(String))
69-
@tax_shipping = T.let(nil, T.nilable(String))
69+
@tax_shipping = T.let(nil, T.nilable(T::Boolean))
7070
@taxes_included = T.let(nil, T.nilable(T::Boolean))
7171
@timezone = T.let(nil, T.nilable(String))
7272
@transactional_sms_disabled = T.let(nil, T.nilable(T::Boolean))
@@ -179,7 +179,7 @@ def initialize(session: ShopifyAPI::Context.active_session, from_hash: nil)
179179
attr_reader :shop_owner
180180
sig { returns(T.nilable(String)) }
181181
attr_reader :source
182-
sig { returns(T.nilable(String)) }
182+
sig { returns(T.nilable(T::Boolean)) }
183183
attr_reader :tax_shipping
184184
sig { returns(T.nilable(T::Boolean)) }
185185
attr_reader :taxes_included

0 commit comments

Comments
 (0)