diff --git a/web_pay_shipping_methods/README.rst b/web_pay_shipping_methods/README.rst old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/__init__.py b/web_pay_shipping_methods/__init__.py old mode 100644 new mode 100755 index 3e46b78b0..d37ffae3f --- a/web_pay_shipping_methods/__init__.py +++ b/web_pay_shipping_methods/__init__.py @@ -17,4 +17,4 @@ # If not, see . # ############################################################################## -from . import models +from . import controllers,models diff --git a/web_pay_shipping_methods/__manifest__.py b/web_pay_shipping_methods/__manifest__.py old mode 100644 new mode 100755 index b5ead8ceb..e6f855277 --- a/web_pay_shipping_methods/__manifest__.py +++ b/web_pay_shipping_methods/__manifest__.py @@ -19,7 +19,7 @@ ############################################################################## { 'name': "Web Pay Shipping Methods", - 'version': '17.0.1.0.0', + 'version': '17.0.1.0.1', 'category': 'eCommerce', 'summary': """Select shipping methods based on payment provider.""", 'description': """The Shipping methods specified for a payment provider diff --git a/web_pay_shipping_methods/controllers/__init__.py b/web_pay_shipping_methods/controllers/__init__.py new file mode 100644 index 000000000..88809e5d4 --- /dev/null +++ b/web_pay_shipping_methods/controllers/__init__.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Mruthul Raj() +# you can modify it under the terms of the GNU AFFERO GENERAL +# PUBLIC LICENSE (AGPL v3), Version 3. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC +# LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from . import main diff --git a/web_pay_shipping_methods/controllers/main.py b/web_pay_shipping_methods/controllers/main.py new file mode 100644 index 000000000..8fd1f26cb --- /dev/null +++ b/web_pay_shipping_methods/controllers/main.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2024-TODAY Cybrosys Technologies(). +# Author: Mruthul Raj() +# you can modify it under the terms of the GNU AFFERO GENERAL +# PUBLIC LICENSE (AGPL v3), Version 3. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC +# LICENSE (AGPL v3) along with this program. +# If not, see . +# +############################################################################## +from odoo import http +from odoo.http import request + + +class WebPayShippingMethods(http.Controller): + + @http.route('/web/deliver/carrier', type='json', auth='public', website=True) + def get_delivery_carriers(self, **kwargs): + provider_id = kwargs.get('provider_id') + payment_provider = request.env['payment.provider'].sudo().browse(provider_id) + return payment_provider.delivery_carrier_ids.ids diff --git a/web_pay_shipping_methods/doc/RELEASE_NOTES.md b/web_pay_shipping_methods/doc/RELEASE_NOTES.md old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/models/__init__.py b/web_pay_shipping_methods/models/__init__.py old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/models/payment_provider.py b/web_pay_shipping_methods/models/payment_provider.py old mode 100644 new mode 100755 index 451f59580..5996312c8 --- a/web_pay_shipping_methods/models/payment_provider.py +++ b/web_pay_shipping_methods/models/payment_provider.py @@ -17,18 +17,14 @@ # If not, see . # ############################################################################## -from odoo import fields, models +from odoo import api, fields, models class PaymentProvider(models.Model): """Inherited payment_provider to add shipping method field""" _inherit = 'payment.provider' - delivery_carrier_ids = fields.Many2many('delivery.carrier', - string="Shipping Methods", - domain="[('website_published'," - " '=', True)]", - help="Add shipping methods which " - "will be available while " - "choosing this payment " - "provider") + delivery_carrier_ids = fields.Many2many('delivery.carrier', string="Shipping Methods", + domain="[('website_published','=', True)]", + help="Add shipping methods which will be available while " + "choosing this payment provider") diff --git a/web_pay_shipping_methods/static/description/assets/icons/capture (1).png b/web_pay_shipping_methods/static/description/assets/icons/capture (1).png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/check.png b/web_pay_shipping_methods/static/description/assets/icons/check.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/chevron.png b/web_pay_shipping_methods/static/description/assets/icons/chevron.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/cogs.png b/web_pay_shipping_methods/static/description/assets/icons/cogs.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/consultation.png b/web_pay_shipping_methods/static/description/assets/icons/consultation.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/ecom-black.png b/web_pay_shipping_methods/static/description/assets/icons/ecom-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/education-black.png b/web_pay_shipping_methods/static/description/assets/icons/education-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/hotel-black.png b/web_pay_shipping_methods/static/description/assets/icons/hotel-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/img.png b/web_pay_shipping_methods/static/description/assets/icons/img.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/license.png b/web_pay_shipping_methods/static/description/assets/icons/license.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/lifebuoy.png b/web_pay_shipping_methods/static/description/assets/icons/lifebuoy.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/manufacturing-black.png b/web_pay_shipping_methods/static/description/assets/icons/manufacturing-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/photo-capture.png b/web_pay_shipping_methods/static/description/assets/icons/photo-capture.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/pos-black.png b/web_pay_shipping_methods/static/description/assets/icons/pos-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/puzzle.png b/web_pay_shipping_methods/static/description/assets/icons/puzzle.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/restaurant-black.png b/web_pay_shipping_methods/static/description/assets/icons/restaurant-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/service-black.png b/web_pay_shipping_methods/static/description/assets/icons/service-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/trading-black.png b/web_pay_shipping_methods/static/description/assets/icons/trading-black.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/training.png b/web_pay_shipping_methods/static/description/assets/icons/training.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/update.png b/web_pay_shipping_methods/static/description/assets/icons/update.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/user.png b/web_pay_shipping_methods/static/description/assets/icons/user.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/icons/wrench.png b/web_pay_shipping_methods/static/description/assets/icons/wrench.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/Cybrosys R.png b/web_pay_shipping_methods/static/description/assets/misc/Cybrosys R.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/categories.png b/web_pay_shipping_methods/static/description/assets/misc/categories.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/check-box.png b/web_pay_shipping_methods/static/description/assets/misc/check-box.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/compass.png b/web_pay_shipping_methods/static/description/assets/misc/compass.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/corporate.png b/web_pay_shipping_methods/static/description/assets/misc/corporate.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/customer-support.png b/web_pay_shipping_methods/static/description/assets/misc/customer-support.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/cybrosys-logo.png b/web_pay_shipping_methods/static/description/assets/misc/cybrosys-logo.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/email.svg b/web_pay_shipping_methods/static/description/assets/misc/email.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/features.png b/web_pay_shipping_methods/static/description/assets/misc/features.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/logo.png b/web_pay_shipping_methods/static/description/assets/misc/logo.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/phone.svg b/web_pay_shipping_methods/static/description/assets/misc/phone.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/pictures.png b/web_pay_shipping_methods/static/description/assets/misc/pictures.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/pie-chart.png b/web_pay_shipping_methods/static/description/assets/misc/pie-chart.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/right-arrow.png b/web_pay_shipping_methods/static/description/assets/misc/right-arrow.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/star (1) 2.svg b/web_pay_shipping_methods/static/description/assets/misc/star (1) 2.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/star.png b/web_pay_shipping_methods/static/description/assets/misc/star.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/support (1) 1.svg b/web_pay_shipping_methods/static/description/assets/misc/support (1) 1.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/support-email.svg b/web_pay_shipping_methods/static/description/assets/misc/support-email.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/support.png b/web_pay_shipping_methods/static/description/assets/misc/support.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/tick-mark.svg b/web_pay_shipping_methods/static/description/assets/misc/tick-mark.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/whatsapp 1.svg b/web_pay_shipping_methods/static/description/assets/misc/whatsapp 1.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/whatsapp.png b/web_pay_shipping_methods/static/description/assets/misc/whatsapp.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/misc/whatsapp.svg b/web_pay_shipping_methods/static/description/assets/misc/whatsapp.svg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/1.gif b/web_pay_shipping_methods/static/description/assets/modules/1.gif old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/2.png b/web_pay_shipping_methods/static/description/assets/modules/2.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/3.png b/web_pay_shipping_methods/static/description/assets/modules/3.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/4.jpg b/web_pay_shipping_methods/static/description/assets/modules/4.jpg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/5.jpg b/web_pay_shipping_methods/static/description/assets/modules/5.jpg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/modules/6.png b/web_pay_shipping_methods/static/description/assets/modules/6.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/screenshots/hero.gif b/web_pay_shipping_methods/static/description/assets/screenshots/hero.gif old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/screenshots/image_1.png b/web_pay_shipping_methods/static/description/assets/screenshots/image_1.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/screenshots/image_2.png b/web_pay_shipping_methods/static/description/assets/screenshots/image_2.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/screenshots/image_3.png b/web_pay_shipping_methods/static/description/assets/screenshots/image_3.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/assets/screenshots/image_4.png b/web_pay_shipping_methods/static/description/assets/screenshots/image_4.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/banner.jpg b/web_pay_shipping_methods/static/description/banner.jpg old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/icon.png b/web_pay_shipping_methods/static/description/icon.png old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/description/index.html b/web_pay_shipping_methods/static/description/index.html old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/static/src/js/PaymentForm.js b/web_pay_shipping_methods/static/src/js/PaymentForm.js old mode 100644 new mode 100755 index 4106c355c..27370bd44 --- a/web_pay_shipping_methods/static/src/js/PaymentForm.js +++ b/web_pay_shipping_methods/static/src/js/PaymentForm.js @@ -2,7 +2,6 @@ import { patch } from "@web/core/utils/patch"; import PaymentForm from '@payment/js/payment_form'; -console.log(PaymentForm) PaymentForm.include({ /** * Function executes when payment provider is clicked and it checks if there are @@ -18,9 +17,11 @@ PaymentForm.include({ $(this).addClass('d-none'); }); let providerId = ev.target.dataset['providerId'] - let carriers = await this.orm.read("payment.provider",[parseInt(providerId)],['delivery_carrier_ids']) - if(carriers[0].delivery_carrier_ids.length > 0){ - carriers[0].delivery_carrier_ids.forEach((id)=>{ + let carriers=await this.rpc('/web/deliver/carrier',{ + 'provider_id':parseInt(providerId), + }) + if(carriers.length > 0){ + carriers.forEach((id)=>{ if(id){ let deliveryMethod = '#delivery_method_'+id $(deliveryMethod)[0].classList.remove('d-none') diff --git a/web_pay_shipping_methods/views/payment_provider_views.xml b/web_pay_shipping_methods/views/payment_provider_views.xml old mode 100644 new mode 100755 diff --git a/web_pay_shipping_methods/views/website_sale_delivery_templates.xml b/web_pay_shipping_methods/views/website_sale_delivery_templates.xml old mode 100644 new mode 100755