From ea16050c3a4d68531adeceb6286757aff0af3893 Mon Sep 17 00:00:00 2001 From: RisvanaCybro Date: Thu, 18 Jul 2024 17:32:58 +0530 Subject: [PATCH] July 18: [FIX] Bug Fixed 'website_subscription_package' --- website_subscription_package/__manifest__.py | 1 + .../controllers/portal.py | 30 +++- .../static/img/image01.png | Bin 0 -> 2557 bytes .../static/src/js/subscription.js | 27 ++++ .../src/xml/subscription_close_modal.xml | 67 +++++++++ .../views/portal_templates.xml | 137 +++++++++++++++++- 6 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 website_subscription_package/static/img/image01.png create mode 100644 website_subscription_package/static/src/js/subscription.js create mode 100644 website_subscription_package/static/src/xml/subscription_close_modal.xml diff --git a/website_subscription_package/__manifest__.py b/website_subscription_package/__manifest__.py index 5bf2e8b23..e09aa15a3 100644 --- a/website_subscription_package/__manifest__.py +++ b/website_subscription_package/__manifest__.py @@ -43,6 +43,7 @@ 'assets': { 'web.assets_frontend': [ 'website_subscription_package/static/src/js/website_sale.js', + 'website_subscription_package/static/src/js/subscription.js' ], }, 'images': ['static/description/banner.jpg'], diff --git a/website_subscription_package/controllers/portal.py b/website_subscription_package/controllers/portal.py index 74ceeecd1..2a14c390b 100644 --- a/website_subscription_package/controllers/portal.py +++ b/website_subscription_package/controllers/portal.py @@ -86,6 +86,9 @@ class SubscriptionCustomerPortal(portal.CustomerPortal): """Render subscription page.""" subscription = request.env['subscription.package'].sudo().browse( subscription) + cancel_reason = request.env['subscription.package.stop'].sudo().search( + []) + users = request.env['res.users'].sudo().search([]) if state == 'Draft': subscription.button_start_date() try: @@ -95,4 +98,29 @@ class SubscriptionCustomerPortal(portal.CustomerPortal): return request.website.render("website.403") return request.render( "website_subscription_package.subscription_page", { - 'subscription': subscription.sudo()}) + 'subscription': subscription.sudo(), + 'users': users, + 'close_reasons': cancel_reason}) + + @http.route( + ['/my/subscription_order/cancel'], + type='http', auth="user", website=True) + def subscription_cancel(self, **post): + """Render subscription page.""" + subscription = request.env['subscription.package'].sudo().browse( + int(post.get('subscription_id'))) + subscription.is_closed = True + subscription.close_reason_id = int(post.get('reason')) + subscription.closed_by = int(post.get('user')) + subscription.close_date = post.get('date_closed') + stage = (request.env['subscription.package.stage'].search([ + ('category', '=', 'closed')]).id) + values = {'stage_id': stage, 'is_to_renew': False} + subscription.write(values) + for lines in subscription.sale_order_id.order_line.filtered( + lambda x: x.product_template_id.is_subscription == True): + lines.qty_invoiced = lines.product_uom_qty + lines.qty_to_invoice = 0 + return request.render( + "website_subscription_package.subscription_page", + {'subscription': subscription.sudo()}) diff --git a/website_subscription_package/static/img/image01.png b/website_subscription_package/static/img/image01.png new file mode 100644 index 0000000000000000000000000000000000000000..51addf3ea63fffd98ecf211ef7e929a49685e164 GIT binary patch literal 2557 zcmaJ@dpwi-AK#EOi6$Z>+uSO4->^lR&1Is5B1(JM6T`O0Hf^lK(u8zTbW`b6M;(=g zQYymIh2zp)>Cl#gt~w`O{A%h>%Yf%>HYf2RuT{+i4?AuNC6QDV{nBDAd1ZglE4TM;AW<`fj%&p zp(`&cMiLViN>3E>alixyC*wnUHVo$DCxd{*R8WFS0F!tEU(Cx3O&Ao9>x+q|h7rOb zCYa0%&Jux9kSb^B- zn*s|ICyIEGgeMfBCKQ1LVTQyPqfhqBE%?xPS%LU#rSvt!%K!*Z#1STL^$i#n_Wz-L z{&%!k5&{03@Bb7QM`c1FJ^~aAGen8{-mP|;2nErZA`p-WMNvXw+P6Z6CkrJ)ak3CX zktjG%)a+=UfGd=W=X@rFh0)mpu>=q#f^3#AMlXTm@wjwvGK0#Xc~dE5DwRkK2=w=- zu^7}qrZ%0JA$P(Kd`KUe1&VlUKyIK&$VYv?GoAP2 zT*yDv`^x41I2Xzfxp;jt_=(Q`SEs)n>FqPI{BB+S=DYbpf!^^Vy|w#FV^+Xm#(Xx5 z5hd$=9%q_1J-}*zk2SxhHv}7#qc}9iSP&JSHvQ8t@Ee>c%2zbJy2Od?q0-k#MEioH6e<@P8;N1i&~Q$ zSa? zt>3R9r1j?(-u{ z7s#*Jb~QQz26yRuum7HurfM~dXUHzUdB;%7HQTc()h+wyjEvess+OUtdAqJj``q)M ztzF_a%|kuZ!x6>Ha;kMTE&i)qUvGHurtFHX@hGlks9POdq@l$(Yi-LE_7EuVEAYz+ znX%QRh-#B%3ApS2k}GXx8wy`LOPDijt=@UZoJZ!&I?8ND*9-poBgZthCQe-QAYIkK zo)KJc7!RC*!}IF12ByY;kSb#x42A~i#DE2&DL@|J>}hqZcN@X-ZC2yZTKDvyDVLiZ z^4EJ&;6)m|Bc{RhPE&L42iqZ{WA?nW$ZQv%O4{%uqh&{t7lT5{`>Id!=p9Etl9fe> zNDGBWN$7K@Q6w=7q#kT+X;_Rt^Ejm5F`w^y@FdSy6X@){65(~payKjC_wyaFoY~Xz;cAu+uiLucM__{dG=%Dgp&AOCM+6VMu2hF)pE~=j;2uSw? z>K>n$KCWJ{bl0J`*DbXv47*z90@IsbIUW8bJd{IqCk~>Mq_cz z!^P8{^Qj`ZYE|BbE`_x6I=1i)^Yq)@&-!PE<*a;Mcx#;dQ$ijgV#Dq89T{C~H(w&C z7Q*sR96jF--YH{;o2Sj+G_%;1_o{^G{i|G)d0c(lXuS2dFBRkNZnfnkb1*3At|5jU z(EOrWTnL?eAK&^ad)m8&Y_nfy@J^o&CfVF^TV*iD8o})&jJ#^ZqIJ&)mK1Ieb}KXv z4c!K-TUPnH=#}%dx+`xrr|z9Fx7tz_G^?oxS$wz#?cjAU#YDq>`lwg{MK9zv%UF@b z!G|szTTDwQ-%MPy%d`v_H$?6UX@upsmAKdyhqqu!Nui;2`?#E`H!t}_9)jOed|D5| z?%pqLxn?#32gur7Fdr#^DoD?w&dxQcz0*{YTKOj$+wYD@4sR1~n5-N)7e5xaa1YE; zAx#YvE|6UCZWxIAHP=ry^y()Nh&*| zz?*Z5W!MhiE7~8jOd-x2$V`+T*JPu6bRT*>*WKE7x>f1g>{5FtR~>-6eG<)iK7a1= z4i5_?MA6PZxY`B!4L9nfAfFjTv;TY*X#-#4F+JDF?I$CONqOh~r`6*oxXaNMPR+dN zzN6bKUZS*9XLn5j(F2t31lZ4T6O7jxAAm`mwg5k2tEpz(ge=ZZ} zJ$QO^$jyf37gDlxwS2_Ec}1$UdsgJMa6@~CNx`lB$jx(tf%}I(eyG}}f+FAGdmj3Q zw|yL3t9@zTShi!Z=Eea;&@VF%8a;v31F=W^J68is(osyOm&pbsxImmPOvp{`;Ox*@ z2X8+=ufO6-V^TiM>v&!JaLIO9roj-|xEd?=*)w-vA(pS}<>Y9ZfE-z1b4lj4^W1!MR=wrt<8 literal 0 HcmV?d00001 diff --git a/website_subscription_package/static/src/js/subscription.js b/website_subscription_package/static/src/js/subscription.js new file mode 100644 index 000000000..898d6e8de --- /dev/null +++ b/website_subscription_package/static/src/js/subscription.js @@ -0,0 +1,27 @@ +/* @odoo-module */ +import publicWidget from "@web/legacy/js/public/public_widget"; +import { jsonrpc } from "@web/core/network/rpc_service"; +import { sprintf } from "@web/core/utils/strings"; +import { _t } from "@web/core/l10n/translation"; +import { loadWysiwygFromTextarea } from "@web_editor/js/frontend/loadWysiwygFromTextarea"; +console.log('LLLLLLLLLLLLLLLLL') +publicWidget.registry.subscriptionDetail = publicWidget.Widget.extend({ + selector: '.subscription_detail_temp', + events: { + 'click .btnShowCloseSubscriptionModal': '_onClickShowModal', + 'click .close_modal': '_onClickCloseModal', + }, + /** + *open modal to apply close reason + */ + _onClickShowModal: function () { + this.el.querySelector('#subscription_close_modal').style.display = 'block'; + }, + /** + *close the document modal + */ + _onClickCloseModal: function () { + this.el.querySelector('#subscription_close_modal').style.display = 'none'; + }, + + }); \ No newline at end of file diff --git a/website_subscription_package/static/src/xml/subscription_close_modal.xml b/website_subscription_package/static/src/xml/subscription_close_modal.xml new file mode 100644 index 000000000..bf8a7bbc4 --- /dev/null +++ b/website_subscription_package/static/src/xml/subscription_close_modal.xml @@ -0,0 +1,67 @@ + \ No newline at end of file diff --git a/website_subscription_package/views/portal_templates.xml b/website_subscription_package/views/portal_templates.xml index bf5f3414b..b427443b4 100644 --- a/website_subscription_package/views/portal_templates.xml +++ b/website_subscription_package/views/portal_templates.xml @@ -27,7 +27,10 @@ priority="30"> + Subscription + Subscription to review @@ -80,7 +83,7 @@