Browse Source

divers

master
root 3 years ago
parent
commit
c5b66229d8
11 changed files with 119 additions and 13 deletions
  1. +10
    -0
      controllers/controllers.py
  2. +3
    -0
      controllers/donation.py
  3. +6
    -0
      i18n/fr.po
  4. +2
    -0
      models/donation.py
  5. +2
    -5
      models/operation.py
  6. +2
    -0
      models/partner.py
  7. +56
    -0
      static/src/js/opendons.js
  8. +0
    -1
      static/src/js/payment_batch.js
  9. +27
    -0
      views/donation.xml
  10. +8
    -1
      views/partner.xml
  11. +3
    -6
      views/payment_batch.xml

+ 10
- 0
controllers/controllers.py View File

@ -1,11 +1,21 @@
# -*- coding: utf-8 -*-
from odoo import http
from odoo.http import request
import werkzeug
from odoo.exceptions import UserError
from odoo.addons.website_sale.controllers.main import WebsiteSale
import json
class opendons(http.Controller):
@http.route(['/opendons/cp'],type='json', methods=['GET','POST'],auth="public",csrf=False)
def index(self, **post):
name = post.get('name', False)
res={}
res['dd']='ggggg'
json_object = json.dumps(res, indent = 4)
return json_object
class SalesProduct(WebsiteSale):
@http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True)


+ 3
- 0
controllers/donation.py View File

@ -10,3 +10,6 @@ class donation(http.Controller):
def make_donation(self, **kw):
return http.request.render('opendons.makedonation_form')

+ 6
- 0
i18n/fr.po View File

@ -60,6 +60,12 @@ msgstr " de requêtes"
msgid "# of segment"
msgstr ""
#. module: opendons
#: code:addons/opendons/models/operation.py:0
#, python-format
msgid "name already exist"
msgstr "ce nom existe déjà"
#. module: opendons
#: model:ir.model.fields,field_description:opendons.field_opendons_operation__number_of_sending
msgid "# of sending"


+ 2
- 0
models/donation.py View File

@ -10,6 +10,8 @@ import base64
class DonationDonation(models.Model):
_inherit = 'donation.donation'
donor_id=fields.Char(related='partner_id.donor_id')
operation_id = fields.Many2one(
'opendons.operation',
string='Operation',


+ 2
- 5
models/operation.py View File

@ -72,10 +72,7 @@ class opendons_operation(models.Model):
ondelete='restrict',
default=_default_currency
)
# _sql_constraints = [
# ('name_uniq', 'unique (name)', "Name already exists !")
# ]
number_of_sending = fields.Integer(
compute='_compute_number_of_sending',
@ -266,7 +263,7 @@ class opendons_operation(models.Model):
if "company_id" in vals:
self = self.with_company(vals["company_id"])
if op : raise Warning('name already exist')
if op : raise Warning(_('name already exist'))
res=super(opendons_operation, self).create(vals)
#création du segment d'exclusion


+ 2
- 0
models/partner.py View File

@ -146,6 +146,8 @@ class partner(models.Model):
donor_id=fields.Char('Donor id',compute="_compute_donor_id",store=True)
def _compute_donor_id(self):
for rec in self:
if rec.key:


+ 56
- 0
static/src/js/opendons.js View File

@ -0,0 +1,56 @@
odoo.define('opendons.opendons', function (require) {
"use strict";
$("body").on("click","[name='zip']",function(ev){
alert('toto');
});
// var rpc=require('web.rpc');
// return {
// start: function (){
// $('[name="zip"]').keydown(function(event) {
// alert('toto');
// });
// },
// }
// $(document).ready( function()
// {
// // $.ajax({
// // url: '/opendons/cp',
// // type: "POST",
// // data: fd,
// // dataType: 'json',
// // cache: false,
// // contentType: 'application/json; charset=utf-8',
// // processData: false,
// // success: function(data){
// // console.log('Success! ' + data);
// // form.submit();
// // },
// // error: function(data){
// // document.getElementById('form_error').innerHTML = "Stran je potrebno osvežit!";
// // console.log(data);
// // }
// });
});

+ 0
- 1
static/src/js/payment_batch.js View File

@ -1,7 +1,6 @@
odoo.define('opendons.payment_batch', function (require) {
"use strict";
//opendons
});

+ 27
- 0
views/donation.xml View File

@ -26,6 +26,33 @@
</data>
<record id="opendons_donation_tree" model="ir.ui.view">
<field name="name">opendons.donation.recurring.tree</field>
<field name="model">donation.donation</field>
<field name="inherit_id" ref="donation.donation_tree" />
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field
name="frequency"
invisible="not context.get('recurring_view')"/>
</field>
</field>
</record>
<record id="opendons_donation_tree2" model="ir.ui.view">
<field name="name">opendons.donation.recurring.tree</field>
<field name="model">donation.donation</field>
<field name="inherit_id" ref="donation.donation_tree" />
<field name="arch" type="xml">
<field name="partner_id" position="before">
<field
name="donor_id"/>
</field>
</field>
</record>
<record id="view_opendons_donation_recurring_generate_form" model="ir.ui.view">
<field name="name">opendons.donation.recurring_generate.form</field>
<field name="model">donation.recurring.generate</field>


+ 8
- 1
views/partner.xml View File

@ -2,6 +2,13 @@
<odoo>
<template id="assets_backend" name="opendons assets backend" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/opendons/static/src/js/opendons.js"></script>
</xpath>
</template>
<record id="contacts.action_contacts" model="ir.actions.act_window">
<field name="name">Contacts</field>
<field name="type">ir.actions.act_window</field>
@ -135,7 +142,7 @@
<xpath expr="//div[@class='o_address_format']" position="replace">
<field name="street" placeholder="Street..." class="o_address_street" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="street2" placeholder="Street 2..." class="o_address_street" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="zip" placeholder="ZIP" class="o_address_zip" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="zip" placeholder="ZIP" class="o_address_zip" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="city" placeholder="City" class="o_address_city" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>


+ 3
- 6
views/payment_batch.xml View File

@ -1,17 +1,14 @@
<odoo>
<data>
<template id="assets_backend" name="js assets" inherit_id="web.assets_backend">
<!-- <template id="assets_backend" name="js assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script
type="text/javascript"
src="/opendons/static/src/js/payment_batch.js">
</script>
<!-- <link
href="/custom_module_name/static/src/css/filenmae.css"
rel="stylesheet"
type="text/css"/> -->
</xpath>
</template>
</template> -->
<record model="ir.ui.view" id="opendons.payment_batch">
<field name="name">opendons_payment_batch list</field>


Loading…
Cancel
Save