Skip to content

Commit c434a37

Browse files
committed
Update file names
1 parent 5d8a771 commit c434a37

7 files changed

+62
-6
lines changed

discounts/javascript/discount/default/shopify.extension.toml.liquid

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ description = "t:description"
1414

1515
[[extensions.targeting]]
1616
target = "cart.delivery-options.discounts.generate.run"
17-
input_query = "src/cart_delivery_options_generate_run.graphql"
18-
export = "cart-delivery-options-generate-run"
19-
17+
input_query = "src/cart_delivery_options_discounts_generate_run.graphql"
18+
export = "cart-delivery-options-discounts-generate-run"
19+
2020
[extensions.build]
2121
command = ""
2222
path = "dist/function.wasm"

discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.test.liquid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
{%- if flavor contains "vanilla-js" -%}
23
import {describe, it, expect} from "vitest";
34

discounts/rust/discount/default/shopify.extension.toml.liquid

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ description = "t:description"
99

1010
[[extensions.targeting]]
1111
target = "cart.lines.discounts.generate.run"
12-
input_query = "src/generate_cart_run.graphql"
12+
input_query = "src/cart_lines_discounts_generate_run.graphql"
1313
export = "cart_lines_discounts_generate_run"
1414

1515
[[extensions.targeting]]
1616
target = "cart.delivery-options.discounts.generate.run"
17-
input_query = "src/generate_delivery_run.graphql"
17+
input_query = "src/cart_delivery_options_discounts_generate_run.graphql"
1818
export = "cart_delivery_options_discounts_generate_run"
1919

2020
[extensions.build]
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
query Input { cart { lines { id cost { subtotalAmount { amount } } } } discount { discountClasses } }
1+
query Input {
2+
cart {
3+
lines {
4+
id
5+
cost {
6+
subtotalAmount {
7+
amount
8+
}
9+
}
10+
}
11+
}
12+
discount {
13+
discountClasses
14+
}
15+
}

discounts/rust/discount/default/src/cart_lines_discounts_generate_run.rs

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ fn cart_lines_discounts_generate_run(
2424
let has_order_discount_class = input
2525
.discount
2626
.discount_classes
27+
<<<<<<< HEAD
2728
.contains(&input::DiscountClass::ORDER);
2829
let has_product_discount_class = input
2930
.discount
@@ -32,23 +33,46 @@ fn cart_lines_discounts_generate_run(
3233

3334
if !has_order_discount_class && !has_product_discount_class {
3435
return Ok(output::CartLinesDiscountsGenerateRunResult { operations: vec![] });
36+
=======
37+
.contains(&DiscountClass::ORDER);
38+
let has_product_discount_class = input
39+
.discount
40+
.discount_classes
41+
.contains(&DiscountClass::PRODUCT);
42+
43+
if !has_order_discount_class && !has_product_discount_class {
44+
return Ok(CartLinesDiscountsGenerateRunResult { operations: vec![] });
45+
>>>>>>> c85625f (Update file names)
3546
}
3647

3748
let mut operations = vec![];
3849

3950
// Check if the discount has the ORDER class
4051
if has_order_discount_class {
52+
<<<<<<< HEAD
4153
operations.push(output::CartOperation::OrderDiscountsAdd(
4254
output::OrderDiscountsAddOperation {
4355
selection_strategy: output::OrderDiscountSelectionStrategy::FIRST,
4456
candidates: vec![output::OrderDiscountCandidate {
4557
targets: vec![output::OrderDiscountCandidateTarget::OrderSubtotal(
4658
output::OrderSubtotalTarget {
59+
=======
60+
operations.push(CartOperation::OrderDiscountsAdd(
61+
OrderDiscountsAddOperation {
62+
selection_strategy: OrderDiscountSelectionStrategy::FIRST,
63+
candidates: vec![OrderDiscountCandidate {
64+
targets: vec![OrderDiscountCandidateTarget::OrderSubtotal(
65+
OrderSubtotalTarget {
66+
>>>>>>> c85625f (Update file names)
4767
excluded_cart_line_ids: vec![],
4868
},
4969
)],
5070
message: Some("10% OFF ORDER".to_string()),
71+
<<<<<<< HEAD
5172
value: output::OrderDiscountCandidateValue::Percentage(output::Percentage {
73+
=======
74+
value: OrderDiscountCandidateValue::Percentage(Percentage {
75+
>>>>>>> c85625f (Update file names)
5276
value: Decimal(10.0),
5377
}),
5478
conditions: None,
@@ -60,6 +84,7 @@ fn cart_lines_discounts_generate_run(
6084

6185
// Check if the discount has the PRODUCT class
6286
if has_product_discount_class {
87+
<<<<<<< HEAD
6388
operations.push(output::CartOperation::ProductDiscountsAdd(
6489
output::ProductDiscountsAddOperation {
6590
selection_strategy: output::ProductDiscountSelectionStrategy::FIRST,
@@ -72,6 +97,18 @@ fn cart_lines_discounts_generate_run(
7297
)],
7398
message: Some("20% OFF PRODUCT".to_string()),
7499
value: output::ProductDiscountCandidateValue::Percentage(output::Percentage {
100+
=======
101+
operations.push(CartOperation::ProductDiscountsAdd(
102+
ProductDiscountsAddOperation {
103+
selection_strategy: ProductDiscountSelectionStrategy::FIRST,
104+
candidates: vec![ProductDiscountCandidate {
105+
targets: vec![ProductDiscountCandidateTarget::CartLine(CartLineTarget {
106+
id: max_cart_line.id.clone(),
107+
quantity: None,
108+
})],
109+
message: Some("20% OFF PRODUCT".to_string()),
110+
value: ProductDiscountCandidateValue::Percentage(Percentage {
111+
>>>>>>> c85625f (Update file names)
75112
value: Decimal(20.0),
76113
}),
77114
associated_discount_code: None,
@@ -80,5 +117,9 @@ fn cart_lines_discounts_generate_run(
80117
));
81118
}
82119

120+
<<<<<<< HEAD
83121
Ok(output::CartLinesDiscountsGenerateRunResult { operations })
122+
=======
123+
Ok(CartLinesDiscountsGenerateRunResult { operations })
124+
>>>>>>> c85625f (Update file names)
84125
}

0 commit comments

Comments
 (0)