Commerce Discount conflicts with Commerce RMA, provided additional checks [#2448751]

We can create line items not only for orders, but hook_commerce_shipping_method_collect_rates() executes on every shipping rates collect event. I've provided additional checks for commerce_discount's implementation

Comment	File	Size	Author
#1	2448751-commerce-discount-shipping-rates-collect-fix.patch	753 bytes	id.tarzanych
#1

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

id.tarzanych CreditAttribution: id.tarzanych commented 9 March 2015 at 12:50

File	Size
2448751-commerce-discount-shipping-rates-collect-fix.patch	753 bytes

Comment #2

joelpittet

English

Vancouver

CreditAttribution: joelpittet commented 20 March 2015 at 23:17

Status:

Needs review

» Needs work

+++ b/commerce_discount.module
@@ -131,8 +131,10 @@ function commerce_discount_remove_discount_components($price_wrapper) {
+  if (!empty($order->order_id) || (empty($order->order_id) && !empty($order->is_new))) {
...

Is there a case when this is false and the $order is not just empty itself?

Comment #3

id.tarzanych CreditAttribution: id.tarzanych commented 23 March 2015 at 07:04

@joelpittet
Exactly. Commerce RMA module sends $order object without any parameters except one or two fields data

Comment #4

joelpittet

English

Vancouver

CreditAttribution: joelpittet commented 17 May 2015 at 22:08

@id.tarzanych can RMA just pass the $order along with it?

Comment #5

id.tarzanych CreditAttribution: id.tarzanych commented 18 May 2015 at 06:31

@joelpittet
Well, it should do that.
But seems that we should wait till Commerce RMA developers change their code to make it compatible with Commerce Coupon 2.x/Commerce Discount or provide additional checks as I did in this patch.

Drupal 8 doesn't have such problem because we can easily check what Entity type object belongs to