From e01d559f9d558ac0a2600cc18efbd011efd26114 Mon Sep 17 00:00:00 2001 From: Johan Demaret Rivarola Date: Thu, 11 Jul 2019 15:31:19 +0000 Subject: [PATCH] [IMP] payment: support SEPA Direct Debit acquirer The purpose of this commit is to expose SEPA Direct Debit acquirer to the Odoo community edition. The dedicated module, though, is restricted to the enterprise edition. Minor changes in following modules: - base: added ir.module.module record - payment: - added data to expose the new payment acquirer. - added 'to_buy' field to track whether the payment acquirer is restricted to enterprise users. - allow multi word payment acquirer name. It was breaking on the first underscore. task-1870363 closes odoo/odoo#26427 --- addons/payment/data/payment_acquirer_data.xml | 13 +++++++++++++ addons/payment/models/payment_acquirer.py | 3 ++- .../payment/static/src/js/payment_processing.js | 2 +- addons/payment/views/payment_views.xml | 12 ++++++++++-- odoo/addons/base/data/ir_module_module.xml | 10 ++++++++++ .../img/icons/payment_sepa_direct_debit.png | Bin 0 -> 2675 bytes 6 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 odoo/addons/base/static/img/icons/payment_sepa_direct_debit.png diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml index 233baf64501..f956de72633 100644 --- a/addons/payment/data/payment_acquirer_data.xml +++ b/addons/payment/data/payment_acquirer_data.xml @@ -279,4 +279,17 @@ + + + SEPA Direct Debit + + + + +

+ SEPA Direct Debit is a Europe-wide Direct Debit system that allows merchants to collect Euro-denominated payments from accounts in the 34 SEPA countries and associated territories. +

+ + + diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index 31df0df1cd8..f9d703972d8 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -154,6 +154,7 @@ class PaymentAcquirer(models.Model): # TDE FIXME: remove that brol module_id = fields.Many2one('ir.module.module', string='Corresponding Module') module_state = fields.Selection(selection=ir_module.STATES, string='Installation State', related='module_id.state', store=True) + module_to_buy = fields.Boolean(string='Odoo Enterprise Module', related='module_id.to_buy', readonly=True, store=False) image_128 = fields.Image("Image", max_width=128, max_height=128) @@ -271,7 +272,7 @@ class PaymentAcquirer(models.Model): # If the trigger comes from the chart template wizard, the modules are already installed. acquirer_modules = self.env['ir.module.module'].search( [('name', 'like', 'payment_%'), ('state', 'in', ('to install', 'installed'))]) - acquirer_names = [a.name.split('_')[1] for a in acquirer_modules] + acquirer_names = [a.name.split('_', 1)[1] for a in acquirer_modules] # Search for acquirers having no journal company = company or self.env.company diff --git a/addons/payment/static/src/js/payment_processing.js b/addons/payment/static/src/js/payment_processing.js index 361cc3dbf4c..53b688be06a 100644 --- a/addons/payment/static/src/js/payment_processing.js +++ b/addons/payment/static/src/js/payment_processing.js @@ -71,7 +71,7 @@ odoo.define('payment.processing', function (require) { 'tx_error': [], }; - if (transactions.length > 0 && transactions[0].acquirer_provider == 'transfer') { + if (transactions.length > 0 && ['transfer', 'sepa_direct_debit'].indexOf(transactions[0].acquirer_provider) >= 0) { window.location = transactions[0].return_url; return; } diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml index f4c4cfc7c05..54264fd2d43 100644 --- a/addons/payment/views/payment_views.xml +++ b/addons/payment/views/payment_views.xml @@ -20,12 +20,14 @@ +

-
@@ -104,10 +106,12 @@ + +
Acquirer @@ -120,7 +124,11 @@ - + + + + Enterprise +
diff --git a/odoo/addons/base/data/ir_module_module.xml b/odoo/addons/base/data/ir_module_module.xml index 7579260be25..058a7880b3a 100644 --- a/odoo/addons/base/data/ir_module_module.xml +++ b/odoo/addons/base/data/ir_module_module.xml @@ -245,5 +245,15 @@ /base/static/img/icons/website_twitter_wall.png + + payment_sepa_direct_debit + Sepa Direct Debit Payment Acquirer + Checkout with SEPA Direct Debit + + OEEL-1 + Odoo S.A. + + /base/static/img/icons/payment_sepa_direct_debit.png + diff --git a/odoo/addons/base/static/img/icons/payment_sepa_direct_debit.png b/odoo/addons/base/static/img/icons/payment_sepa_direct_debit.png new file mode 100644 index 0000000000000000000000000000000000000000..aec41dd16588bf1535588310f722ed667184e0b0 GIT binary patch literal 2675 zcmaJ@2{cr18^2?Wu`e^S4#qafGLc=#))-sUm~2TRm9k{l*tbC%`(UzUqJ*L>S;`V$ zi56R>qL5OumL-40ccnUg-*?V;&U>Ht_q@;V_bl%{_nezdu)%S$i?9O#z=bzAC4xHv zd?Z+*pvB#9#(*31DI;qm0JxpTv2h#*`j7x3&KRhAhMEEZC_u0xnSqCZCy z5bi=YR0@Z5A{c_9lDC;C3KNO~2q%CTE*{5%Ec~rX1Va$fL~g<89U8M}0w9tI75SBR zTLsF0W&puLJ^~Y6!W7^v1b{67=ov2KyH43%5~uw67Kf(RnX^YN zYpJpcKKthC;1;GX$$q-u?yz_t#|@PtN3Qc7v$Oe7#kt)B>Q|wkRkrcZNw*u=zA=%+ zqG%QH&Az&Z=)El1o+CbWo4tmrFkQpelqJ=5No3+CS96BsXgSZ5A|V?qryw^|oT+Pf zf$+o)F0dH@_*hGoDN9hCuY-TBhyNbxSH+Gz@trC$Ui#Evo$*TUkuu)u6ij-M_IL%C zl9pGTw}F=KX&PDcMzX@iKy4aXofREZ8m9yxsRN8%IpOLrN{|idQbSh}H1gi+WVuR; zLT8>BHBe{xI$tLp1>%l8R81--&UfEl7t$z^yi5s}Z)nRfmHSwyfXWo|7SB_{`ziDYa_)s0=7|x7TTx2 zzli#ge%qb-oJEl8qoWq%{PLz;Zio8sFM+-+=y5_>ye(@dsdm<-q0tN<@EZS>0Krbc27 z(ikNt@8CT686hF3hRHKBAwx^kpD;vom$J`eI#!z;qNPeDO%B8#Y7N^G(y5uBn}fpN z%+E{6Vx!cul4l8OucQNX0LMr4Wd48&>v$E1!k6iMImKpYoU{b0^(-^>8baR3-nw(N zC3Jo-zvLp!u*unFJf&%fDF+Vm@CZJK=O+feC-KR^UAr5!y&>p@In4F#!`5%A zag2Mt@%o022&a-CGNv;aA(27vj}^{B^2)THNp+P61#-tYoy2l%MRzACherh_sSBC! zrHFg62*mHR$`kW|MR?k!h8t#kB;3u|^KjT%UpK&K@)GaL%gXtCjy|i?D-)QF$jZS? z!VHzDQWtD;<)o&(*|NW-CZZWD^%=R|r$VW>B#&|V2M&@>v5SeJE~MYd%gy~%J@EdD zdZ0AUR~2}CsBr2y>DeMGaPYIb`tH2EK3$H{cY!geAOG~q$?OUS3>Xgu4N|X#<1~m4tRvh{y z$z3Adri+i=TdS^6x|_q$>a8mW1UVNvWd3N$5sgq@ILE3TN$jgl_i=}is}LFI4!Pfj z!7-S%%ROcWy5Z6FzLMR_`Ij}s_jyZ1?yr9;)9&V{?d9GkDKL2cq{%K+^l9C9e8*U% zM_5`q4w$(OKh?wg_b!KN`HnQ6|Fj72by$)Vzm3lJYwVN}j7N`r!Sz8Hc_y`Vf&pf+ zvEPV1*(0Q*>3?qGp)ybRIF7AkfH0`EbfsCChuRysbal-t_CVQQK36@mo;p!{I>fm( ziF<~@7;l}{Lrd1hDCF~|481l!L$}x;ax8rREj!KA5&l8+V0!b2dWM5;q|Uvq{uONX z+t!t3``L3?4~5|1V2_NG9-hL^!{yeG_lps2J3IQ-$x|k?yVeA7jE`64W?l_9g$$AJ z!43|a@Y4^wtPqO#jCx)ol+GDZiYlaJ>yi5hVhz*F5IE~%S~=6zG?$i3Qx8x1#9Z-Bq&P3hJ$b(Uf=K+fG(+9zrAbUwQy^=`%Y4bfO_ znLNQdQ#K|+jqW3HqSI%dpM`VuF)Qd>2XWB8T>4*=zCgJ l^u}4ot#4T5x?wqWRTPucJJ6zNufP3+h&Qt_tul6v{Wl6*TeAQF literal 0 HcmV?d00001