@graphcommerce/magento-cart 8.1.0-canary.33 → 8.1.0-canary.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 8.1.0-canary.35
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2301](https://github.com/graphcommerce-org/graphcommerce/pull/2301) [`13d0649`](https://github.com/graphcommerce-org/graphcommerce/commit/13d06498d121f93b52c25930e50aa3b0bd12a818) - Created a new EmailElement component to make re-use easier
|
|
8
|
+
([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
|
|
9
|
+
|
|
10
|
+
## 8.1.0-canary.34
|
|
11
|
+
|
|
12
|
+
### Minor Changes
|
|
13
|
+
|
|
14
|
+
- [#2303](https://github.com/graphcommerce-org/graphcommerce/pull/2303) [`f407e96`](https://github.com/graphcommerce-org/graphcommerce/commit/f407e961868683a257c8f7fe8ceb588fb825db9b) - Get shippingMethodPrices from selected shipping method if supported on the magento version
|
|
15
|
+
([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
|
|
16
|
+
|
|
3
17
|
## 8.1.0-canary.33
|
|
4
18
|
|
|
5
19
|
## 8.1.0-canary.32
|
|
@@ -8,8 +8,14 @@ fragment CartTotals on Cart @inject(into: ["CartItemCountChanged", "PaymentMetho
|
|
|
8
8
|
amount {
|
|
9
9
|
...Money
|
|
10
10
|
}
|
|
11
|
+
price_excl_tax {
|
|
12
|
+
...Money
|
|
13
|
+
}
|
|
14
|
+
price_incl_tax {
|
|
15
|
+
...Money
|
|
16
|
+
}
|
|
11
17
|
}
|
|
12
|
-
# todo:
|
|
18
|
+
# todo: When 245 is not supported anymore, remove available_shipping_methods from fragment.
|
|
13
19
|
available_shipping_methods {
|
|
14
20
|
carrier_code
|
|
15
21
|
method_code
|
|
@@ -42,12 +42,15 @@ export function CartTotals(props: CartTotalsProps) {
|
|
|
42
42
|
const { shipping_addresses, prices } = data.cart
|
|
43
43
|
const shippingMethod = shipping_addresses?.[0]?.selected_shipping_method
|
|
44
44
|
|
|
45
|
-
const shippingMethodPrices =
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
45
|
+
const shippingMethodPrices =
|
|
46
|
+
import.meta.graphCommerce.magentoVersion >= 246
|
|
47
|
+
? shippingMethod
|
|
48
|
+
: shipping_addresses?.[0]?.available_shipping_methods?.find(
|
|
49
|
+
(avail) =>
|
|
50
|
+
(shippingMethod?.amount?.value ?? 0) > 0 &&
|
|
51
|
+
avail?.carrier_code === shippingMethod?.carrier_code &&
|
|
52
|
+
avail?.method_code === shippingMethod?.method_code,
|
|
53
|
+
)
|
|
51
54
|
|
|
52
55
|
return (
|
|
53
56
|
<Box
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { useQuery } from '@graphcommerce/graphql'
|
|
2
1
|
import {
|
|
3
2
|
SignUpFormInline,
|
|
4
3
|
IsEmailAvailableDocument,
|
|
@@ -7,7 +6,6 @@ import {
|
|
|
7
6
|
} from '@graphcommerce/magento-customer'
|
|
8
7
|
import { Button, FormRow, extendableComponent } from '@graphcommerce/next-ui'
|
|
9
8
|
import { Trans } from '@lingui/react'
|
|
10
|
-
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
|
|
11
9
|
import { Box, SxProps, TextField, Theme, Typography } from '@mui/material'
|
|
12
10
|
import React, { useState } from 'react'
|
|
13
11
|
import { useCartQuery } from '../../hooks/useCartQuery'
|
|
@@ -101,8 +99,7 @@ export function InlineAccount(props: InlineAccountProps) {
|
|
|
101
99
|
<FormRow>
|
|
102
100
|
<TextField
|
|
103
101
|
variant='outlined'
|
|
104
|
-
|
|
105
|
-
label='Email'
|
|
102
|
+
label={<Trans id='Email address' />}
|
|
106
103
|
value={cart?.email}
|
|
107
104
|
InputProps={{
|
|
108
105
|
readOnly: true,
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@graphcommerce/magento-cart",
|
|
3
3
|
"homepage": "https://www.graphcommerce.org/",
|
|
4
4
|
"repository": "github:graphcommerce-org/graphcommerce",
|
|
5
|
-
"version": "8.1.0-canary.
|
|
5
|
+
"version": "8.1.0-canary.35",
|
|
6
6
|
"sideEffects": false,
|
|
7
7
|
"prettier": "@graphcommerce/prettier-config-pwa",
|
|
8
8
|
"eslintConfig": {
|
|
@@ -12,20 +12,20 @@
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"peerDependencies": {
|
|
15
|
-
"@graphcommerce/ecommerce-ui": "^8.1.0-canary.
|
|
16
|
-
"@graphcommerce/eslint-config-pwa": "^8.1.0-canary.
|
|
17
|
-
"@graphcommerce/framer-next-pages": "^8.1.0-canary.
|
|
18
|
-
"@graphcommerce/framer-scroller": "^8.1.0-canary.
|
|
19
|
-
"@graphcommerce/framer-utils": "^8.1.0-canary.
|
|
20
|
-
"@graphcommerce/graphql": "^8.1.0-canary.
|
|
21
|
-
"@graphcommerce/image": "^8.1.0-canary.
|
|
22
|
-
"@graphcommerce/magento-customer": "^8.1.0-canary.
|
|
23
|
-
"@graphcommerce/magento-graphql": "^8.1.0-canary.
|
|
24
|
-
"@graphcommerce/magento-store": "^8.1.0-canary.
|
|
25
|
-
"@graphcommerce/next-ui": "^8.1.0-canary.
|
|
26
|
-
"@graphcommerce/prettier-config-pwa": "^8.1.0-canary.
|
|
27
|
-
"@graphcommerce/react-hook-form": "^8.1.0-canary.
|
|
28
|
-
"@graphcommerce/typescript-config-pwa": "^8.1.0-canary.
|
|
15
|
+
"@graphcommerce/ecommerce-ui": "^8.1.0-canary.35",
|
|
16
|
+
"@graphcommerce/eslint-config-pwa": "^8.1.0-canary.35",
|
|
17
|
+
"@graphcommerce/framer-next-pages": "^8.1.0-canary.35",
|
|
18
|
+
"@graphcommerce/framer-scroller": "^8.1.0-canary.35",
|
|
19
|
+
"@graphcommerce/framer-utils": "^8.1.0-canary.35",
|
|
20
|
+
"@graphcommerce/graphql": "^8.1.0-canary.35",
|
|
21
|
+
"@graphcommerce/image": "^8.1.0-canary.35",
|
|
22
|
+
"@graphcommerce/magento-customer": "^8.1.0-canary.35",
|
|
23
|
+
"@graphcommerce/magento-graphql": "^8.1.0-canary.35",
|
|
24
|
+
"@graphcommerce/magento-store": "^8.1.0-canary.35",
|
|
25
|
+
"@graphcommerce/next-ui": "^8.1.0-canary.35",
|
|
26
|
+
"@graphcommerce/prettier-config-pwa": "^8.1.0-canary.35",
|
|
27
|
+
"@graphcommerce/react-hook-form": "^8.1.0-canary.35",
|
|
28
|
+
"@graphcommerce/typescript-config-pwa": "^8.1.0-canary.35",
|
|
29
29
|
"@lingui/core": "^4.2.1",
|
|
30
30
|
"@lingui/macro": "^4.2.1",
|
|
31
31
|
"@lingui/react": "^4.2.1",
|