From 452e6605bb431d085729aa23d445092e1069f21f Mon Sep 17 00:00:00 2001
From: Jasmine Ning <jasmine@himama.com>
Date: Tue, 28 Nov 2023 16:56:58 -0500
Subject: [PATCH 1/5] Set sub merchant to alllive if not available

---
 .idea/workspace.xml   | 64 +++++++++++++++++++++++++++++++++++++++++++
 lib/bambora/client.rb |  2 ++
 2 files changed, 66 insertions(+)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..ecab4aa
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 5
+}</component>
+  <component name="ProjectId" id="2YmtB1FgHqEhlh97mkQcQZK91n6" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "CM-278/allow-retrieve-all-sub-merch",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "ruby.rails.projectView.checked": "true",
+    "ruby.structure.view.model.defaults.configured": "true",
+    "settings.editor.selected.configurable": "vcs.Subversion",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="" />
+      <created>1701142443720</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1701142443720</updated>
+      <workItem from="1701142445783" duration="271000" />
+      <workItem from="1701142724278" duration="10540000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/lib/bambora/client.rb b/lib/bambora/client.rb
index ff19dc0..01f9801 100644
--- a/lib/bambora/client.rb
+++ b/lib/bambora/client.rb
@@ -72,6 +72,8 @@ def initialize(options = {})
         instance_variable_set("@#{key}", value)
       end
 
+      @sub_merchant_id = 'AllLive' if sub_merchant_id.nil?
+
       yield(self) if block_given?
     end
 

From 242171f6c6cee59407b5baec1b8f0649620162ac Mon Sep 17 00:00:00 2001
From: Jasmine Ning <jasmine@himama.com>
Date: Thu, 30 Nov 2023 10:33:40 -0500
Subject: [PATCH 2/5] :remove the sub_merchant_id from the client

---
 .idea/bambora-client.iml                  | 89 +++++++++++++++++++++++
 .idea/workspace.xml                       | 39 +++++-----
 lib/bambora/bank/batch_report_resource.rb |  9 ++-
 lib/bambora/client.rb                     |  4 +-
 4 files changed, 118 insertions(+), 23 deletions(-)
 create mode 100644 .idea/bambora-client.iml

diff --git a/.idea/bambora-client.iml b/.idea/bambora-client.iml
new file mode 100644
index 0000000..36735be
--- /dev/null
+++ b/.idea/bambora-client.iml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="rbenv: 2.7.7" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.5, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.3.10, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="byebug (v11.1.3, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.3, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.5, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="excon (v0.104.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v2.0.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-excon (v2.1.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-multipart (v1.0.4, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-net_http (v2.1.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.4.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.6, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.9.2, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.5.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2023.1003, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.3.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multiparty (v0.2.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.23.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parser (v3.2.2.4, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pry (v0.12.2, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pry-byebug (v3.8.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v5.0.4, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="racc (v1.7.3, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.1.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.6, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.12.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.12.2, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.12.3, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.12.6, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.12.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.74.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.13.0, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby2_keywords (v0.0.5, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, rbenv: 2.7.7) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="webmock (v3.19.1, rbenv: 2.7.7) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build bambora-client-0.6.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if bambora-client-0.6.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install bambora-client-0.6.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install bambora-client-0.6.0.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.6.0 and build and push bambora-client-0.6.0.gem to https://rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecab4aa..d7cafeb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="" />
+    <list default="true" id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/console" beforeDir="false" afterPath="$PROJECT_DIR$/bin/console" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/bambora/bank/batch_report_resource.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/bambora/bank/batch_report_resource.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/bambora/client.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/bambora/client.rb" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -24,23 +29,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "CM-278/allow-retrieve-all-sub-merch",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "ruby.rails.projectView.checked": "true",
-    "ruby.structure.view.model.defaults.configured": "true",
-    "settings.editor.selected.configurable": "vcs.Subversion",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;CM-278/allow-retrieve-all-sub-merch&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;ruby.structure.view.model.defaults.configured&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Subversion&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
   <component name="SvnConfiguration">
diff --git a/lib/bambora/bank/batch_report_resource.rb b/lib/bambora/bank/batch_report_resource.rb
index 4684833..a1f992b 100644
--- a/lib/bambora/bank/batch_report_resource.rb
+++ b/lib/bambora/bank/batch_report_resource.rb
@@ -79,11 +79,14 @@ def add_messages_to_response(response)
       end
 
       def batch_report_body(request_data)
-        DEFAULT_REQUEST_PARAMS.merge(request_data).merge(
+        additional_data = {
           merchant_id: client.merchant_id,
           pass_code: api_key,
-          sub_merchant_id: client.sub_merchant_id,
-        )
+        }
+
+        params = DEFAULT_REQUEST_PARAMS.merge(additional_data).merge(request_data)
+
+        client.sub_merchant_id.nil? ? params : params.merge(sub_merchant_id: client.sub_merchant_id)
       end
     end
   end
diff --git a/lib/bambora/client.rb b/lib/bambora/client.rb
index 01f9801..d6d7587 100644
--- a/lib/bambora/client.rb
+++ b/lib/bambora/client.rb
@@ -72,8 +72,6 @@ def initialize(options = {})
         instance_variable_set("@#{key}", value)
       end
 
-      @sub_merchant_id = 'AllLive' if sub_merchant_id.nil?
-
       yield(self) if block_given?
     end
 
@@ -165,7 +163,7 @@ def bank_profiles(api_key:)
     #
     # @param api_key [String] API key for the bank profiles endpoint.
     #
-    # @return [Bambora::Bank::PaymentProfileResource]
+    # @return [Bambora::Bank::BatchReportResource]
     def batch_reports(api_key:)
       @batch_reports = Bambora::Bank::BatchReportResource.new(
         client: xml_client,

From e726079010ee06d4535e3efafae4d6bd4d44d697 Mon Sep 17 00:00:00 2001
From: Jasmine Ning <jasmine@himama.com>
Date: Fri, 1 Dec 2023 01:45:22 -0500
Subject: [PATCH 3/5] Add tests

---
 .idea/bambora-client.iml                      | 89 -------------------
 .idea/workspace.xml                           | 69 --------------
 .../bank/batch_report_resource_spec.rb        | 52 ++++++++++-
 3 files changed, 51 insertions(+), 159 deletions(-)
 delete mode 100644 .idea/bambora-client.iml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/bambora-client.iml b/.idea/bambora-client.iml
deleted file mode 100644
index 36735be..0000000
--- a/.idea/bambora-client.iml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="rbenv: 2.7.7" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.5, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.3.10, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="byebug (v11.1.3, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.3, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.5, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="excon (v0.104.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday (v2.0.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday-excon (v2.1.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday-multipart (v1.0.4, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday-net_http (v2.1.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.4.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.6, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.9.2, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.5.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2023.1003, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.3.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multiparty (v0.2.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.23.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v3.2.2.4, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="pry (v0.12.2, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="pry-byebug (v3.8.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v5.0.4, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="racc (v1.7.3, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.1.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.6, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.12.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.12.2, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.12.3, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.12.6, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.12.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.74.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.13.0, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby2_keywords (v0.0.5, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, rbenv: 2.7.7) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="webmock (v3.19.1, rbenv: 2.7.7) [gem]" level="application" />
-  </component>
-  <component name="RakeTasksCache">
-    <option name="myRootTask">
-      <RakeTaskImpl id="rake">
-        <subtasks>
-          <RakeTaskImpl description="Build bambora-client-0.6.0.gem into the pkg directory" fullCommand="build" id="build" />
-          <RakeTaskImpl id="build">
-            <subtasks>
-              <RakeTaskImpl description="Generate SHA512 checksum if bambora-client-0.6.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
-            </subtasks>
-          </RakeTaskImpl>
-          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
-          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
-          <RakeTaskImpl description="Build and install bambora-client-0.6.0.gem into system gems" fullCommand="install" id="install" />
-          <RakeTaskImpl id="install">
-            <subtasks>
-              <RakeTaskImpl description="Build and install bambora-client-0.6.0.gem into system gems without network access" fullCommand="install:local" id="local" />
-            </subtasks>
-          </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.6.0 and build and push bambora-client-0.6.0.gem to https://rubygems.org" fullCommand="release[remote]" id="release[remote]" />
-          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
-          <RakeTaskImpl description="" fullCommand="default" id="default" />
-          <RakeTaskImpl description="" fullCommand="release" id="release" />
-          <RakeTaskImpl id="release">
-            <subtasks>
-              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
-              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
-              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
-            </subtasks>
-          </RakeTaskImpl>
-        </subtasks>
-      </RakeTaskImpl>
-    </option>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index d7cafeb..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/console" beforeDir="false" afterPath="$PROJECT_DIR$/bin/console" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/bambora/bank/batch_report_resource.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/bambora/bank/batch_report_resource.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/bambora/client.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/bambora/client.rb" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 5
-}</component>
-  <component name="ProjectId" id="2YmtB1FgHqEhlh97mkQcQZK91n6" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;CM-278/allow-retrieve-all-sub-merch&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;ruby.structure.view.model.defaults.configured&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Subversion&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
-  <component name="SvnConfiguration">
-    <configuration>$USER_HOME$/.subversion</configuration>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="0f6532fa-b6eb-402e-b02b-efabdbf2f2b2" name="Changes" comment="" />
-      <created>1701142443720</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1701142443720</updated>
-      <workItem from="1701142445783" duration="271000" />
-      <workItem from="1701142724278" duration="10540000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/spec/bambora/bank/batch_report_resource_spec.rb b/spec/bambora/bank/batch_report_resource_spec.rb
index 6708362..dce3c4f 100644
--- a/spec/bambora/bank/batch_report_resource_spec.rb
+++ b/spec/bambora/bank/batch_report_resource_spec.rb
@@ -6,12 +6,15 @@ module Bambora
   module Bank
     describe BatchReportResource do
       subject(:reports) { described_class.new(client: client, api_key: api_key) }
+      subject(:reports_without_sub_merchant_id) do
+        described_class.new(client: client_withot_sub_merchant_id, api_key: api_key)
+      end
 
       let(:api_key) { 'fakekey' }
       let(:merchant_id) { 1 }
       let(:sub_merchant_id) { 2 }
       let(:base_url) { 'https://sandbox-web.na.bambora.com' }
-      let(:headers) { { 'Authorization' => 'Passcode MTpmYWtla2V5', 'Sub-Merchant-ID' => sub_merchant_id } }
+
       let(:response_body) do
         {
           response: {
@@ -96,6 +99,15 @@ module Bank
         )
       end
 
+      let(:client_withot_sub_merchant_id) do
+        instance_double(
+          'Bambora::Rest::XMLClient',
+          merchant_id: merchant_id,
+          sub_merchant_id: nil,
+          post: response_body,
+        )
+      end
+
       describe '#show' do
         let(:batch_id) { 1 }
         let(:from_date) { Time.now.to_s }
@@ -112,6 +124,7 @@ module Bank
             service_name: service_name,
           }
         end
+
         let(:posted_data) do
           {
             body: {
@@ -132,6 +145,34 @@ module Bank
           }
         end
 
+        let(:request_data_with_rpt_merchant_id) do
+          {
+            service_name: service_name,
+            rpt_filter_by_1: 'returned_date',
+            rpt_operation_type_1: 'GT',
+            rpt_filter_value_1: '2023-08-01',
+            rpt_merchant_id: 'AllLive',
+          }
+        end
+
+        let(:posted_data_with_rpt_merchant_id) do
+          {
+            body: {
+              merchant_id: 1,
+              pass_code: 'fakekey',
+              rpt_filter_by_1: 'returned_date',
+              rpt_filter_value_1: '2023-08-01',
+              rpt_format: 'JSON',
+              rpt_operation_type_1: 'GT',
+              rpt_version: '2.0',
+              rpt_merchant_id: 'AllLive',
+              service_name: service_name,
+              session_source: 'external',
+            },
+            path: '/scripts/reporting/report.aspx',
+          }
+        end
+
         context 'with no messageId' do
           it 'sends `post` to the client with the correct data' do
             reports.show(request_data)
@@ -141,6 +182,15 @@ module Bank
           it 'returns the expected response' do
             expect(reports.show(request_data)).to eq expected_response
           end
+
+          it 'sends `post` to the client with the correct data where the sub merchant id comes from elements' do
+            reports_without_sub_merchant_id.show(request_data_with_rpt_merchant_id)
+            expect(client_withot_sub_merchant_id).to have_received(:post).with(posted_data_with_rpt_merchant_id)
+          end
+
+          it 'returns the expected response' do
+            expect(reports_without_sub_merchant_id.show(request_data_with_rpt_merchant_id)).to eq expected_response
+          end
         end
 
         context 'with messageIds' do

From 5eb170775d4077be06da926e5f147ea34e9bbf4c Mon Sep 17 00:00:00 2001
From: Jasmine Ning <jasmine@himama.com>
Date: Fri, 1 Dec 2023 14:17:39 -0500
Subject: [PATCH 4/5] Update changelog

---
 CHANGELOG.md                                    | 4 ++++
 spec/bambora/bank/batch_report_resource_spec.rb | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaee500..653dfb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased (2023-12-01)
+
+- Update `BatchReportResource#batch_report_body` to allow `sub merchant id` to be received from `Bambora::Client` or `elements`
+
 ## 0.6.0 (2023-05-02)
 
 - Updating minimum Ruby version to Ruby 2.7.7
diff --git a/spec/bambora/bank/batch_report_resource_spec.rb b/spec/bambora/bank/batch_report_resource_spec.rb
index dce3c4f..76a6a15 100644
--- a/spec/bambora/bank/batch_report_resource_spec.rb
+++ b/spec/bambora/bank/batch_report_resource_spec.rb
@@ -7,7 +7,7 @@ module Bank
     describe BatchReportResource do
       subject(:reports) { described_class.new(client: client, api_key: api_key) }
       subject(:reports_without_sub_merchant_id) do
-        described_class.new(client: client_withot_sub_merchant_id, api_key: api_key)
+        described_class.new(client: client_without_sub_merchant_id, api_key: api_key)
       end
 
       let(:api_key) { 'fakekey' }
@@ -99,7 +99,7 @@ module Bank
         )
       end
 
-      let(:client_withot_sub_merchant_id) do
+      let(:client_without_sub_merchant_id) do
         instance_double(
           'Bambora::Rest::XMLClient',
           merchant_id: merchant_id,
@@ -185,7 +185,7 @@ module Bank
 
           it 'sends `post` to the client with the correct data where the sub merchant id comes from elements' do
             reports_without_sub_merchant_id.show(request_data_with_rpt_merchant_id)
-            expect(client_withot_sub_merchant_id).to have_received(:post).with(posted_data_with_rpt_merchant_id)
+            expect(client_without_sub_merchant_id).to have_received(:post).with(posted_data_with_rpt_merchant_id)
           end
 
           it 'returns the expected response' do

From 022c112688bced69f7b23b6b1a58a16e104f302b Mon Sep 17 00:00:00 2001
From: Jasmine Ning <jasmine@himama.com>
Date: Fri, 1 Dec 2023 14:53:14 -0500
Subject: [PATCH 5/5] Fix pr review

---
 lib/bambora/bank/batch_report_resource.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/bambora/bank/batch_report_resource.rb b/lib/bambora/bank/batch_report_resource.rb
index a1f992b..bd19b37 100644
--- a/lib/bambora/bank/batch_report_resource.rb
+++ b/lib/bambora/bank/batch_report_resource.rb
@@ -79,14 +79,11 @@ def add_messages_to_response(response)
       end
 
       def batch_report_body(request_data)
-        additional_data = {
+        DEFAULT_REQUEST_PARAMS.merge(request_data).merge(
           merchant_id: client.merchant_id,
           pass_code: api_key,
-        }
-
-        params = DEFAULT_REQUEST_PARAMS.merge(additional_data).merge(request_data)
-
-        client.sub_merchant_id.nil? ? params : params.merge(sub_merchant_id: client.sub_merchant_id)
+          sub_merchant_id: client.sub_merchant_id,
+        ).compact
       end
     end
   end