Skip to content

Commit b2756ca

Browse files
lukeholderlukeholder
committed
Merge branch 'release/4.3.2'
2 parents bdca33a + 6e6384f commit b2756ca

File tree

33 files changed

+207
-56
lines changed

33 files changed

+207
-56
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Release Notes for Craft Commerce
22

3+
## 4.3.2 - 2023-10-31
4+
5+
- Product GraphQL queries now support `promotable`, `freeShipping`, `defaultSku`, `defaultHeight`, `defaultLength`, `defaultWidth`, and `defaultWeight` arguments. ([#3307](https://github.com/craftcms/commerce/pull/3307))
6+
- Product GraphQL queries now support `promotable`, `freeShipping`, `defaultSku`, `defaultHeight`, `defaultLength`, `defaultWidth`, `defaultWeight`, and `defaultVariant` fields. ([#3307](https://github.com/craftcms/commerce/pull/3307))
7+
- Fixed a bug where it was possible to select soft-deleted tax categories.
8+
- Fixed a PHP error that occurred when sending an email with a missing PDF filename format. ([#3309](https://github.com/craftcms/commerce/issues/3309))
9+
- Fixed a PHP error that occurred when viewing soft-deleted orders. ([#3308](https://github.com/craftcms/commerce/issues/3308))
10+
- Fixed a bug where saving a shipping zone could fail if a tax zone existed with the same name. ([#3317](https://github.com/craftcms/commerce/issues/3317))
11+
- Fixed a bug where `craft\commerce\services\LineItems::getLineItemById()` wasn’t decoding the snapshot data. ([#3253](https://github.com/craftcms/commerce/issues/3253))
12+
313
## 4.3.1 - 2023-10-18
414

515
- Added the `commerce/gateways/list` command.
@@ -15,6 +25,7 @@
1525
- Fixed a bug where sales’ and discounts’ timestamps weren’t getting populated. ([#3298](https://github.com/craftcms/commerce/issues/3298))
1626
- Fixed a bug where the `commerce/upgrade` command could create duplicate inactive users. ([#3286](https://github.com/craftcms/commerce/issues/3286))
1727
- Fixed a bug where `commerce/payments/pay` JSON responses were missing the `redirect` key. ([#3265](https://github.com/craftcms/commerce/issues/3265))
28+
- Fixed a bug where gateway URLs could be malformed. ([#3299](https://github.com/craftcms/commerce/issues/3299))
1829

1930
## 4.3.0 - 2023-09-13
2031

@@ -50,6 +61,7 @@
5061
- Fixed a bug where Commerce wasn’t invoking `craft\services\Elements::EVENT_AUTHORIZE_*` event handlers.
5162
- Fixed a bug where discounts’ per user usage counters weren’t getting migrated properly when upgrading to Commerce 4.
5263
- Fixed a bug where address changes weren’t being synced to carts that were using them. ([#3178](https://github.com/craftcms/commerce/issues/3178))
64+
- Fixed a SQL error that could occur when fetching emails. ([#3267](https://github.com/craftcms/commerce/pull/3267))
5365
- Fixed an XSS vulnerability.
5466

5567
## 4.2.11 - 2023-06-05

‎example-templates/dist/shop/_private/address/list.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
{% set primaryShippingAddressId = primaryShippingAddressId ?? null %}
55
{% set showDelete = showDelete ?? false %}
66
{% set showAdd = showAdd ?? false %}
7-
{% set addUrl = '/shop/customer/addresses/edit?redirect=' ~ craft.app.request.fullPath %}
7+
{% set addUrl = siteUrl('shop/customer/addresses/edit?redirect=' ~ craft.app.request.pathInfo) %}
88

99
{% if currentUser %}
1010
<div class="my-6 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-2 xl:grid-cols-3 gap-4">
1111
{% for address in addresses %}
12-
{% set editUrl = '/shop/customer/addresses/edit?addressId=' ~ address.id ~ '&redirect=' ~ craft.app.request.fullPath %}
12+
{% set editUrl = 'shop/customer/addresses/edit?addressId=' ~ address.id ~ '&redirect=' ~ craft.app.request.pathInfo %}
1313
<div class="block border border-gray-200 bg-white rounded-lg shadow-sm hover:shadow-md p-4 w-full relative">
1414
{% tag selectable ? 'label' : 'div' with {
1515
class: 'block relative address-select js-address-select',
@@ -62,7 +62,7 @@
6262
</div>
6363
{% endfor %}
6464
{% if showAdd %}
65-
<a href="{{ addUrl }}" class="block rounded-lg border border-gray-200 bg-white hover:shadow-md w-full relative">
65+
<a href="{{ addUrl }}" class="block rounded-lg border border-gray-200 bg-white hover:shadow-md w-full relative" style="min-height: 100px;">
6666
<div class="absolute top-0 left-0 right-0 bottom-0 flex items-center">
6767
<div class="flex items-center justify-center h-full p-4 w-full group">
6868
<span class="group-hover:underline">Add Address</span>

‎example-templates/dist/shop/_private/layouts/includes/header.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="bg-gray-900">
22
<div class="container mx-auto p-6 md:flex justify-content-between align-content-center">
33
<h1 class="text-3xl">
4-
<a href="{{ siteUrl('/shop') }}" class="text-white">
4+
<a href="{{ siteUrl('shop') }}" class="text-white">
55
{{- siteName ~ ' Shop' -}}
66
</a>
77
</h1>

‎example-templates/dist/shop/cart/index.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ Outputs cart.
320320
</form>
321321
{% else %}
322322
<p>{{ 'Empty cart. Add items on the {link} page.'|t({
323-
link: tag('a', { href: url('/shop/products'), text: 'products', class: 'underline' })
323+
link: tag('a', { href: url('shop/products'), text: 'products', class: 'underline' })
324324
})|raw }}</p>
325325
{% endif %}
326326
{% endblock %}

‎example-templates/dist/shop/cart/load.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Outputs form for collecting a cart number to be loaded.
77
<form method="post" action="">
88
{{ csrfInput() }}
99
{{ actionInput('commerce/cart/load-cart') }}
10-
{{ redirectInput('/shop/cart') }}
10+
{{ redirectInput('shop/cart') }}
1111

1212
<h1 class="text-xl font-bold">
1313
{{- 'Load Cart'|t -}}

‎example-templates/dist/shop/checkout/pay-static.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
>
138138
{{ csrfInput() }}
139139
{{ hiddenInput('action', 'commerce/payments/pay') }}
140-
{{ redirectInput('/shop/customer/order?number=' ~ cart.number ~ '&success=true') }}
140+
{{ redirectInput('shop/customer/order?number=' ~ cart.number ~ '&success=true') }}
141141
{{ hiddenInput('cancelUrl', craft.app.request.getUrl()|hash) }}
142142
{{ hiddenInput('email', email) }}
143143
{{ hiddenInput('number', cart.number) }}

‎example-templates/dist/shop/checkout/register-signin.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
{{- 'Checkout'|t -}}
5555
</h2>
5656
<div class="mt-3">
57-
<a href="{{ url('/shop/checkout/addresses') }}" class="text-blue-500 hover:text-blue-600">
57+
<a href="{{ url('shop/checkout/addresses') }}" class="text-blue-500 hover:text-blue-600">
5858
{{ 'Or continue as guest'|t }} &rarr;
5959
</a>
6060
</div>

‎example-templates/dist/shop/customer/cards.twig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{% if paymentSource.id != currentUser.primaryPaymentSourceId %}
3434
<form method="post" action="">
3535
{{ csrfInput() }}
36-
{{ redirectInput('/shop/customer/cards') }}
36+
{{ redirectInput('shop/customer/cards') }}
3737
{{ actionInput('commerce/payment-sources/set-primary-payment-source') }}
3838
{{ hiddenInput('id', paymentSource.id) }}
3939
{{ tag('button', {
@@ -45,7 +45,7 @@
4545
{% endif %}
4646
<form method="post" action="">
4747
{{ csrfInput() }}
48-
{{ redirectInput('/shop/customer/cards') }}
48+
{{ redirectInput('shop/customer/cards') }}
4949
{{ actionInput('commerce/payment-sources/delete') }}
5050
{{ hiddenInput('id', paymentSource.id) }}
5151
{{ tag('button', {
@@ -118,8 +118,8 @@
118118
{{ actionInput('commerce/payment-sources/add') }}
119119
{{ hiddenInput('gatewayId', gateway.id) }}
120120
{{ hiddenInput('successMessage', 'Added payment source.'|hash) }}
121-
{{ hiddenInput('cancelUrl', '/shop/customer/cards'|hash) }}
122-
{{ redirectInput('/shop/customer/cards') }}
121+
{{ hiddenInput('cancelUrl', 'shop/customer/cards'|hash) }}
122+
{{ redirectInput('shop/customer/cards') }}
123123

124124
{% set params = {} %}
125125

‎example-templates/dist/shop/customer/index.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% redirect '/shop/customer/orders' %}
1+
{% redirect 'shop/customer/orders' %}

‎example-templates/dist/shop/customer/orders.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{% endset %}
99

1010
{% if not currentUser %}
11-
{% redirect '/shop/customer/sign-in' %}
11+
{% redirect 'shop/customer/sign-in' %}
1212
{% endif %}
1313

1414

0 commit comments

Comments
 (0)