Update fmt

Author: devisscher

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

@@ -24,7 +24,6 @@ fn cart_lines_discounts_generate_run(
     let has_order_discount_class = input
         .discount
         .discount_classes
-<<<<<<< HEAD
         .contains(&input::DiscountClass::ORDER);
     let has_product_discount_class = input
         .discount
@@ -33,46 +32,23 @@ fn cart_lines_discounts_generate_run(
 
     if !has_order_discount_class && !has_product_discount_class {
         return Ok(output::CartLinesDiscountsGenerateRunResult { operations: vec![] });
-=======
-        .contains(&DiscountClass::ORDER);
-    let has_product_discount_class = input
-        .discount
-        .discount_classes
-        .contains(&DiscountClass::PRODUCT);
-
-    if !has_order_discount_class && !has_product_discount_class {
-        return Ok(CartLinesDiscountsGenerateRunResult { operations: vec![] });
->>>>>>> c85625f (Update file names)
     }
 
     let mut operations = vec![];
 
     // Check if the discount has the ORDER class
     if has_order_discount_class {
-<<<<<<< HEAD
         operations.push(output::CartOperation::OrderDiscountsAdd(
             output::OrderDiscountsAddOperation {
                 selection_strategy: output::OrderDiscountSelectionStrategy::FIRST,
                 candidates: vec![output::OrderDiscountCandidate {
                     targets: vec![output::OrderDiscountCandidateTarget::OrderSubtotal(
                         output::OrderSubtotalTarget {
-=======
-        operations.push(CartOperation::OrderDiscountsAdd(
-            OrderDiscountsAddOperation {
-                selection_strategy: OrderDiscountSelectionStrategy::FIRST,
-                candidates: vec![OrderDiscountCandidate {
-                    targets: vec![OrderDiscountCandidateTarget::OrderSubtotal(
-                        OrderSubtotalTarget {
->>>>>>> c85625f (Update file names)
                             excluded_cart_line_ids: vec![],
                         },
                     )],
                     message: Some("10% OFF ORDER".to_string()),
-<<<<<<< HEAD
                     value: output::OrderDiscountCandidateValue::Percentage(output::Percentage {
-=======
-                    value: OrderDiscountCandidateValue::Percentage(Percentage {
->>>>>>> c85625f (Update file names)
                         value: Decimal(10.0),
                     }),
                     conditions: None,
@@ -84,7 +60,6 @@ fn cart_lines_discounts_generate_run(
 
     // Check if the discount has the PRODUCT class
     if has_product_discount_class {
-<<<<<<< HEAD
         operations.push(output::CartOperation::ProductDiscountsAdd(
             output::ProductDiscountsAddOperation {
                 selection_strategy: output::ProductDiscountSelectionStrategy::FIRST,
@@ -97,18 +72,6 @@ fn cart_lines_discounts_generate_run(
                     )],
                     message: Some("20% OFF PRODUCT".to_string()),
                     value: output::ProductDiscountCandidateValue::Percentage(output::Percentage {
-=======
-        operations.push(CartOperation::ProductDiscountsAdd(
-            ProductDiscountsAddOperation {
-                selection_strategy: ProductDiscountSelectionStrategy::FIRST,
-                candidates: vec![ProductDiscountCandidate {
-                    targets: vec![ProductDiscountCandidateTarget::CartLine(CartLineTarget {
-                        id: max_cart_line.id.clone(),
-                        quantity: None,
-                    })],
-                    message: Some("20% OFF PRODUCT".to_string()),
-                    value: ProductDiscountCandidateValue::Percentage(Percentage {
->>>>>>> c85625f (Update file names)
                         value: Decimal(20.0),
                     }),
                     associated_discount_code: None,
@@ -117,9 +80,5 @@ fn cart_lines_discounts_generate_run(
         ));
     }
 
-<<<<<<< HEAD
     Ok(output::CartLinesDiscountsGenerateRunResult { operations })
-=======
-    Ok(CartLinesDiscountsGenerateRunResult { operations })
->>>>>>> c85625f (Update file names)
 }