Skip to content

Commit

Permalink
Merge pull request #189 from pamil/product-variant-adjustments
Browse files Browse the repository at this point in the history 
Remove ProductVariantView::$appliedPromotions
  • Loading branch information
@lchrusciel
lchrusciel authored Jul 17, 2017
2 parents a1f4a80 + f1459dd commit 5ce3937
Show file tree
Hide file tree
Showing 24 changed files with 74 additions and 152 deletions.
7 changes: 1 addition & 6 deletions src/View/ProductVariantView.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,10 @@ class ProductVariantView
public $price;

/**
* @var array
* @var ImageView[]
*/
public $images = [];

/**
* @var array
*/
public $appliedPromotions = [];

public function __construct()
{
$this->price = new PriceView();
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/cart/add_simple_product_to_cart_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/cart/cart_with_coupon_based_promotion_applied_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
6 changes: 2 additions & 4 deletions tests/Responses/Expected/cart/filled_cart_with_product_variant_summary_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [],
Expand Down Expand Up @@ -88,8 +87,7 @@
"price": {
"current": 500
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [],
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/cart/filled_cart_with_simple_product_summary_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/cart/german_filled_cart_with_product_variant_summary_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"price": {
"current": 590
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [],
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/cart/german_filled_cart_with_simple_product_summary_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 2099
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/checkout/cart_addressed_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions ...xpected/checkout/cart_addressed_with_different_shipping_and_billing_address_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/checkout/cart_with_chosen_payment_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/checkout/cart_with_chosen_shipment_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"price": {
"current": 1999
},
"images": [],
"appliedPromotions": []
"images": []
}
],
"attributes": [
Expand Down
24 changes: 8 additions & 16 deletions tests/Responses/Expected/product/german_product_list_page_by_code_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down Expand Up @@ -87,8 +86,7 @@
"price": {
"current": 500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_RED_LOGAN_HAT_CODE": {
"code": "LARGE_RED_LOGAN_HAT_CODE",
Expand All @@ -104,8 +102,7 @@
"price": {
"current": 999
},
"images": [],
"appliedPromotions": []
"images": []
},
"SMALL_BLUE_LOGAN_HAT_CODE": {
"code": "SMALL_BLUE_LOGAN_HAT_CODE",
Expand All @@ -121,8 +118,7 @@
"price": {
"current": 1500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_BLUE_LOGAN_HAT_CODE": {
"code": "LARGE_BLUE_LOGAN_HAT_CODE",
Expand All @@ -138,8 +134,7 @@
"price": {
"current": 2599
},
"images": [],
"appliedPromotions": []
"images": []
}
},
"attributes": [],
Expand Down Expand Up @@ -171,8 +166,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down Expand Up @@ -221,8 +215,7 @@
"code": "thumbnail",
"path": "\/uo\/samll-tshirt.jpg"
}
],
"appliedPromotions": []
]
},
"LARGE_LOGAN_T_SHIRT_CODE": {
"code": "LARGE_LOGAN_T_SHIRT_CODE",
Expand All @@ -237,8 +230,7 @@
"code": "thumbnail",
"path": "\/uo\/large-tshirt.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [],
Expand Down
24 changes: 8 additions & 16 deletions tests/Responses/Expected/product/german_product_list_page_by_slug_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down Expand Up @@ -87,8 +86,7 @@
"price": {
"current": 500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_RED_LOGAN_HAT_CODE": {
"code": "LARGE_RED_LOGAN_HAT_CODE",
Expand All @@ -104,8 +102,7 @@
"price": {
"current": 999
},
"images": [],
"appliedPromotions": []
"images": []
},
"SMALL_BLUE_LOGAN_HAT_CODE": {
"code": "SMALL_BLUE_LOGAN_HAT_CODE",
Expand All @@ -121,8 +118,7 @@
"price": {
"current": 1500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_BLUE_LOGAN_HAT_CODE": {
"code": "LARGE_BLUE_LOGAN_HAT_CODE",
Expand All @@ -138,8 +134,7 @@
"price": {
"current": 2599
},
"images": [],
"appliedPromotions": []
"images": []
}
},
"attributes": [],
Expand Down Expand Up @@ -171,8 +166,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down Expand Up @@ -221,8 +215,7 @@
"code": "thumbnail",
"path": "\/uo\/samll-tshirt.jpg"
}
],
"appliedPromotions": []
]
},
"LARGE_LOGAN_T_SHIRT_CODE": {
"code": "LARGE_LOGAN_T_SHIRT_CODE",
Expand All @@ -237,8 +230,7 @@
"code": "thumbnail",
"path": "\/uo\/large-tshirt.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [],
Expand Down
21 changes: 7 additions & 14 deletions tests/Responses/Expected/product/german_product_with_options_details_page.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"price": {
"current": 500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_RED_LOGAN_HAT_CODE": {
"code": "LARGE_RED_LOGAN_HAT_CODE",
Expand All @@ -43,8 +42,7 @@
"price": {
"current": 999
},
"images": [],
"appliedPromotions": []
"images": []
},
"SMALL_BLUE_LOGAN_HAT_CODE": {
"code": "SMALL_BLUE_LOGAN_HAT_CODE",
Expand All @@ -60,8 +58,7 @@
"price": {
"current": 1500
},
"images": [],
"appliedPromotions": []
"images": []
},
"LARGE_BLUE_LOGAN_HAT_CODE": {
"code": "LARGE_BLUE_LOGAN_HAT_CODE",
Expand All @@ -77,8 +74,7 @@
"price": {
"current": 2599
},
"images": [],
"appliedPromotions": []
"images": []
}
},
"attributes": [],
Expand Down Expand Up @@ -110,8 +106,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down Expand Up @@ -160,8 +155,7 @@
"code": "thumbnail",
"path": "\/uo\/samll-tshirt.jpg"
}
],
"appliedPromotions": []
]
},
"LARGE_LOGAN_T_SHIRT_CODE": {
"code": "LARGE_LOGAN_T_SHIRT_CODE",
Expand All @@ -176,8 +170,7 @@
"code": "thumbnail",
"path": "\/uo\/large-tshirt.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [],
Expand Down
3 changes: 1 addition & 2 deletions tests/Responses/Expected/product/german_simple_product_details_page.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"code": "thumbnail",
"path": "\/uo\/mug.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [
Expand Down
6 changes: 2 additions & 4 deletions tests/Responses/Expected/product/limited_product_list_page_by_code_response.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"code": "thumbnail",
"path": "\/uo\/samll-tshirt.jpg"
}
],
"appliedPromotions": []
]
},
"LARGE_LOGAN_T_SHIRT_CODE": {
"code": "LARGE_LOGAN_T_SHIRT_CODE",
Expand All @@ -52,8 +51,7 @@
"code": "thumbnail",
"path": "\/uo\/large-tshirt.jpg"
}
],
"appliedPromotions": []
]
}
},
"attributes": [],
Expand Down
Loading

0 comments on commit 5ce3937

Please sign in to comment.