Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -265,7 +265,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text})
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text}
+                    or o.client_order_id = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and p.client_moniker=#{search_text}
@@ -345,7 +346,8 @@
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
                     and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id =#{search_text} or o.channel = #{search_text} )
+                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text}  or t.order_id = #{search_text}
+                    or o.client_order_id = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and p.client_moniker=#{search_text}
@@ -362,6 +364,15 @@
                 <if test="text_type=='sys_trans_id'">
                     and t.system_transaction_id =#{search_text}
                 </if>
+                <if test="text_type=='remark'">
+                    and o.order_detail like #{name_pattern}
+                </if>
+                <if test="text_type=='order_id'">
+                    and t.order_id = #{search_text}
+                </if>
+                <if test="text_type=='client_order_id'">
+                    and o.client_order_id = #{search_text}
+                </if>
             </if>
             <if test="org_ids!=null">and p.org_id in
                 <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>