Prefer a store specific payment method if it exists

app/models/spree/adyen/notification_processor.rb

@@ -132,7 +132,7 @@ def create_missing_payment
           amount: notification.money.dollars,
           # We have no idea what payment method they used, this will be
           # updated when/if they get redirected
-          payment_method: Spree::Gateway::AdyenHPP.last,
+          payment_method: payment_method_for(order),
           response_code: notification.psp_reference,
           source: source,
           order: order
@@ -143,6 +143,12 @@ def create_missing_payment
         payment
       end
 
+      def payment_method_for(order)
+        order.store.payment_methods.where(type: 'Spree::Gateway::AdyenHPP', active: true).last!
+      rescue
+        Spree::Gateway::AdyenHPP.last
+      end
+
       def should_create_payment?
         notification.authorisation? &&
         notification.success? &&

spec/models/spree/adyen/notification_processor_spec.rb

@@ -152,10 +152,33 @@
             create(:notification, :auth, order: order)
           end
 
-          it "creates a payment" do
-            expect { subject }.
-              to change { order.payments.count }.
-              to 1
+          context "creates a payment" do
+            it do
+              expect { subject }.
+                to change { order.payments.count }.
+                to 1
+            end
+
+            it "is store specific" do
+              store_specific_payment_method = create(:spree_gateway_adyen_hpp)
+
+              order.store.payment_methods << store_specific_payment_method
+
+              _other_payment_method = create(:spree_gateway_adyen_hpp)
+
+              expect(
+                subject.order.payments.last.payment_method
+              ).to eq(store_specific_payment_method)
+            end
+
+            it "is default" do
+              other_payment_method = create(:spree_gateway_adyen_hpp)
+
+              expect(
+                subject.order.payments.last.payment_method
+              ).to eq(other_payment_method)
+            end
+
           end
 
           it "completes the order" do