From 46e2f58040b6611e3c9106a5ec7b97e52f67a84d Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 2 Feb 2023 11:31:44 +0700 Subject: add search dunning run for partner and document number --- indoteknik_custom/views/dunning_run.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml index c251b206..6343a79b 100644 --- a/indoteknik_custom/views/dunning_run.xml +++ b/indoteknik_custom/views/dunning_run.xml @@ -82,10 +82,23 @@ + + dunning.run.list.select + dunning.run + + + + + + + + + Dunning Run ir.actions.act_window dunning.run + tree,form -- cgit v1.2.3 From 8cb3d124ec96b78872ebd0d0c969564249f15671 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 3 Feb 2023 10:39:38 +0700 Subject: [FIX] feature download invoice --- indoteknik_api/controllers/api_v1/download.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/download.py b/indoteknik_api/controllers/api_v1/download.py index 36f775b5..38225b85 100644 --- a/indoteknik_api/controllers/api_v1/download.py +++ b/indoteknik_api/controllers/api_v1/download.py @@ -16,9 +16,10 @@ class Download(controller.Controller): return result if len(result) > 0 else None @http.route(PREFIX + 'download/invoice/', auth='none', method=['GET']) - def download_invoice(self, **kw): - id = int(kw.get('id', 0)) - return request.render('account.report_invoice', {'id': id}) + def download_invoice(self, id): + id = int(id) + data = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'account.report_invoice')])._render_qweb_pdf([id]) + return request.make_response(base64.b64decode(data[0]), [('Content-Type', 'application/pdf')]) @http.route(PREFIX + 'download/tax-invoice//', auth='none', method=['GET']) def download_tax_invoice(self, id, token): @@ -28,6 +29,7 @@ class Download(controller.Controller): if md5_by_id == token: attachment = self._get_attachment('account.move', 'efaktur_document', id) if attachment: + attachment = attachment[0] return request.make_response(base64.b64decode(attachment['datas']), [('Content-Type', attachment['mimetype'])]) return self.response('Dokumen tidak ditemukan', code=404) -- cgit v1.2.3 From 6b5f3041727d84db4d24215062940b8f2fca6d1c Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 3 Feb 2023 14:43:58 +0700 Subject: [FIX] feature download invoice --- indoteknik_api/controllers/api_v1/download.py | 28 ++++++++++++++++----------- indoteknik_api/models/account_move.py | 3 ++- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/download.py b/indoteknik_api/controllers/api_v1/download.py index 38225b85..3794744e 100644 --- a/indoteknik_api/controllers/api_v1/download.py +++ b/indoteknik_api/controllers/api_v1/download.py @@ -15,22 +15,28 @@ class Download(controller.Controller): ], ['datas', 'mimetype']) return result if len(result) > 0 else None - @http.route(PREFIX + 'download/invoice/', auth='none', method=['GET']) - def download_invoice(self, id): + @http.route(PREFIX + 'download/invoice//', auth='none', method=['GET']) + def download_invoice(self, id, token): id = int(id) - data = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'account.report_invoice')])._render_qweb_pdf([id]) - return request.make_response(base64.b64decode(data[0]), [('Content-Type', 'application/pdf')]) + + md5_by_id = request.env['rest.api'].md5_salt(id, 'account.move') + if not md5_by_id == token: + return self.response('Unauthorized') + + pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'account.report_invoice')])._render_qweb_pdf([id]) + return request.make_response(pdf, [('Content-Type', 'application/pdf')]) @http.route(PREFIX + 'download/tax-invoice//', auth='none', method=['GET']) def download_tax_invoice(self, id, token): id = int(id) md5_by_id = request.env['rest.api'].md5_salt(id, 'account.move') - if md5_by_id == token: - attachment = self._get_attachment('account.move', 'efaktur_document', id) - if attachment: - attachment = attachment[0] - return request.make_response(base64.b64decode(attachment['datas']), [('Content-Type', attachment['mimetype'])]) - return self.response('Dokumen tidak ditemukan', code=404) + if not md5_by_id == token: + return self.response('Unauthorized') + + attachment = self._get_attachment('account.move', 'efaktur_document', id) + if attachment: + attachment = attachment[0] + return request.make_response(base64.b64decode(attachment['datas']), [('Content-Type', attachment['mimetype'])]) + return self.response('Dokumen tidak ditemukan', code=404) - return self.response('Tidak diizinkan') diff --git a/indoteknik_api/models/account_move.py b/indoteknik_api/models/account_move.py index f77ded16..3c8fd655 100644 --- a/indoteknik_api/models/account_move.py +++ b/indoteknik_api/models/account_move.py @@ -8,6 +8,7 @@ class AccountMove(models.Model): def api_v1_single_response(self, account_move, context=False): data = { + 'token': self.env['rest.api'].md5_salt(account_move.id, 'account.move'), 'id': account_move.id, 'name': account_move.name, 'purchase_order_name': account_move.ref or '', @@ -16,7 +17,7 @@ class AccountMove(models.Model): 'amount_total': account_move.amount_total, 'amount_residual': account_move.amount_residual, 'invoice_date': '', - 'efaktur_token': self.env['rest.api'].md5_salt(account_move.id, 'account.move') if account_move.efaktur_document else '', + 'efaktur': True if account_move.efaktur_document else False, } if isinstance(object, datetime.date): data['invoice_date'] = account_move.invoice_date.strftime('%d/%m/%Y') -- cgit v1.2.3 From 446e3be759d72b7a06b4e4671b91c6f9c8bfa903 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 6 Feb 2023 12:02:42 +0700 Subject: add api cancel SO and upload PO in SO --- indoteknik_api/controllers/api_v1/download.py | 8 ++-- indoteknik_api/controllers/api_v1/sale_order.py | 56 +++++++++++++++++++++++++ indoteknik_api/models/account_move.py | 1 - indoteknik_api/models/rest_api.py | 5 ++- indoteknik_api/models/sale_order.py | 1 + 5 files changed, 65 insertions(+), 6 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/download.py b/indoteknik_api/controllers/api_v1/download.py index 3794744e..f12be337 100644 --- a/indoteknik_api/controllers/api_v1/download.py +++ b/indoteknik_api/controllers/api_v1/download.py @@ -19,8 +19,8 @@ class Download(controller.Controller): def download_invoice(self, id, token): id = int(id) - md5_by_id = request.env['rest.api'].md5_salt(id, 'account.move') - if not md5_by_id == token: + md5_valid = request.env['rest.api'].md5_salt_valid(id, 'account.move', token) + if not md5_valid: return self.response('Unauthorized') pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'account.report_invoice')])._render_qweb_pdf([id]) @@ -30,8 +30,8 @@ class Download(controller.Controller): def download_tax_invoice(self, id, token): id = int(id) - md5_by_id = request.env['rest.api'].md5_salt(id, 'account.move') - if not md5_by_id == token: + md5_valid = request.env['rest.api'].md5_salt_valid(id, 'account.move', token) + if not md5_valid: return self.response('Unauthorized') attachment = self._get_attachment('account.move', 'efaktur_document', id) diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 52ccf9fa..9a4b23d9 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -105,6 +105,62 @@ class SaleOrder(controller.Controller): return self.response(data) + @http.route(PREFIX_PARTNER + 'sale_order//upload_po', auth='public', method=['POST', 'OPTIONS'], csrf=False) + def partner_upload_po_sale_order(self, **kw): + user_token = self.authenticate() + if not user_token: + return self.unauthorized_response() + + params = self.get_request_params(kw, { + 'partner_id': ['number'], + 'id': ['number'], + 'name': [], + 'file': [] + }) + if not user_token['partner_id'] == params['value']['partner_id']: + return self.unauthorized_response() + if not params['valid']: + return self.response(code=400, description=params) + partner_child_ids = self.get_partner_child_ids(params['value']['partner_id']) + domain = [ + ('id', '=', params['value']['id']), + ('partner_id', 'in', partner_child_ids) + ] + data = False + sale_order = request.env['sale.order'].search(domain) + if sale_order: + sale_order.partner_purchase_order_name = params['value']['name'] + sale_order.partner_purchase_order_file = params['value']['file'] + data = sale_order.id + return self.response(data) + + @http.route(PREFIX_PARTNER + 'sale_order//cancel', auth='public', method=['POST', 'OPTIONS'], csrf=False) + def partner_cancel_sale_order(self, **kw): + user_token = self.authenticate() + if not user_token: + return self.unauthorized_response() + + params = self.get_request_params(kw, { + 'partner_id': ['number'], + 'id': ['number'] + }) + if not user_token['partner_id'] == params['value']['partner_id']: + return self.unauthorized_response() + if not params['valid']: + return self.response(code=400, description=params) + + partner_child_ids = self.get_partner_child_ids(params['value']['partner_id']) + domain = [ + ('id', '=', params['value']['id']), + ('partner_id', 'in', partner_child_ids) + ] + data = False + sale_order = request.env['sale.order'].search(domain) + if sale_order: + sale_order.state = 'cancel' + data = sale_order.id + return self.response(data) + @http.route(PREFIX_PARTNER + 'sale_order/checkout', auth='public', method=['POST', 'OPTIONS'], csrf=False) def create_partner_sale_order(self, **kw): user_token = self.authenticate() diff --git a/indoteknik_api/models/account_move.py b/indoteknik_api/models/account_move.py index 3c8fd655..5c31f010 100644 --- a/indoteknik_api/models/account_move.py +++ b/indoteknik_api/models/account_move.py @@ -1,6 +1,5 @@ import datetime from odoo import models -import hashlib class AccountMove(models.Model): diff --git a/indoteknik_api/models/rest_api.py b/indoteknik_api/models/rest_api.py index 052800b7..0a15aad1 100644 --- a/indoteknik_api/models/rest_api.py +++ b/indoteknik_api/models/rest_api.py @@ -14,4 +14,7 @@ class RestApi(models.TransientModel): return time def md5_salt(self, value, salt): - return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() \ No newline at end of file + return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() + + def md5_salt_valid(self, value, salt, token): + return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() == token \ No newline at end of file diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index c7d488be..cc2f9586 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -32,6 +32,7 @@ class SaleOrder(models.Model): if context == 'with_detail': res_users = self.env['res.users'] data_with_detail = { + 'purchase_order_file': True if sale_order.partner_purchase_order_file else False, 'payment_term': sale_order.payment_term_id.name or '', 'date_order': self.env['rest.api'].datetime_to_str(sale_order.date_order, '%d/%m/%Y %H:%M:%S'), 'products': [], -- cgit v1.2.3 From bd02610d6d148eee0196555abb2eac00670dfd2e Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Mon, 6 Feb 2023 13:23:18 +0700 Subject: only accounting can post or reset to draft invoices --- indoteknik_custom/models/account_move.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index 1e0c56cf..54e51dcf 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -1,4 +1,5 @@ from odoo import models, api, fields +from odoo.exceptions import AccessError, UserError, ValidationError from datetime import timedelta @@ -12,6 +13,18 @@ class AccountMove(models.Model): date_terima_tukar_faktur = fields.Date(string='Terima Faktur') shipper_faktur_id = fields.Many2one('delivery.carrier', string='Shipper Faktur') + def button_draft(self): + res = super(AccountMove, self).button_draft() + if not self.env.user.is_accounting: + raise UserError('Hanya Accounting yang bisa Reset to Draft') + return res + + def action_post(self): + res = super(AccountMove, self).action_post() + if not self.env.user.is_accounting: + raise UserError('Hanya Accounting yang bisa Posting') + return res + @api.onchange('date_kirim_tukar_faktur') def change_date_kirim_tukar_faktur(self): for invoice in self: -- cgit v1.2.3 From ef2f9fefe4df844f5a676d2a166dcd4dfdaa249b Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 6 Feb 2023 16:14:43 +0700 Subject: fix feature --- indoteknik_api/controllers/api_v1/download.py | 28 +++++++++++------ indoteknik_api/controllers/api_v1/sale_order.py | 40 +++++++++++++++++++++++++ indoteknik_api/models/rest_api.py | 29 +++++++++++++++++- indoteknik_api/models/sale_order.py | 3 +- 4 files changed, 89 insertions(+), 11 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/download.py b/indoteknik_api/controllers/api_v1/download.py index f12be337..d9353896 100644 --- a/indoteknik_api/controllers/api_v1/download.py +++ b/indoteknik_api/controllers/api_v1/download.py @@ -1,7 +1,6 @@ from .. import controller from odoo import http from odoo.http import request -import base64 class Download(controller.Controller): @@ -13,30 +12,41 @@ class Download(controller.Controller): ('res_field', '=', field), ('res_id', '=', id), ], ['datas', 'mimetype']) - return result if len(result) > 0 else None + return result[0] if len(result) > 0 else None @http.route(PREFIX + 'download/invoice//', auth='none', method=['GET']) def download_invoice(self, id, token): id = int(id) - md5_valid = request.env['rest.api'].md5_salt_valid(id, 'account.move', token) + rest_api = request.env['rest.api'] + md5_valid = rest_api.md5_salt_valid(id, 'account.move', token) if not md5_valid: return self.response('Unauthorized') + account_move = request.env['account.move'].sudo().search_read([('id', '=', id)], ['name']) pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'account.report_invoice')])._render_qweb_pdf([id]) - return request.make_response(pdf, [('Content-Type', 'application/pdf')]) + return rest_api.response_attachment({ + 'content': pdf, + 'mimetype': 'application/pdf', + 'filename': account_move[0]['name'] + }) @http.route(PREFIX + 'download/tax-invoice//', auth='none', method=['GET']) def download_tax_invoice(self, id, token): id = int(id) - md5_valid = request.env['rest.api'].md5_salt_valid(id, 'account.move', token) + rest_api = request.env['rest.api'] + md5_valid = rest_api.md5_salt_valid(id, 'account.move', token) if not md5_valid: return self.response('Unauthorized') + account_move = request.env['account.move'].sudo().search_read([('id', '=', id)], ['name']) attachment = self._get_attachment('account.move', 'efaktur_document', id) - if attachment: - attachment = attachment[0] - return request.make_response(base64.b64decode(attachment['datas']), [('Content-Type', attachment['mimetype'])]) + if attachment and len(account_move) > 0: + return rest_api.response_attachment({ + 'content': attachment['datas'], + 'decode_content': True, + 'mimetype': attachment['mimetype'], + 'filename': account_move[0]['name'], + }) return self.response('Dokumen tidak ditemukan', code=404) - diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 9a4b23d9..1c67d6c5 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -3,6 +3,7 @@ from odoo import http from odoo.http import request import json + class SaleOrder(controller.Controller): prefix = '/api/v1/' PREFIX_PARTNER = prefix + 'partner//' @@ -134,6 +135,45 @@ class SaleOrder(controller.Controller): data = sale_order.id return self.response(data) + @http.route(PREFIX_PARTNER + 'sale_order//download_po/', auth='none', method=['GET']) + def partner_download_po_sale_order(self, id, token): + id = int(id) + + rest_api = request.env['rest.api'] + md5_valid = rest_api.md5_salt_valid(id, 'sale.order', token) + if not md5_valid: + return self.response('Unauthorized') + + sale_order = request.env['sale.order'].sudo().search_read([('id', '=', id)], ['partner_purchase_order_name']) + attachment = rest_api.get_single_attachment('sale.order', 'partner_purchase_order_file', id) + if attachment and len(sale_order) > 0: + return rest_api.response_attachment({ + 'content': attachment['datas'], + 'decode_content': True, + 'mimetype': attachment['mimetype'], + 'filename': sale_order[0]['partner_purchase_order_name'] + }) + return self.response('Dokumen tidak ditemukan', code=404) + + @http.route(PREFIX_PARTNER + 'sale_order//download/', auth='none', method=['GET']) + def partner_download_sale_order(self, id, token): + id = int(id) + + rest_api = request.env['rest.api'] + md5_valid = rest_api.md5_salt_valid(id, 'sale.order', token) + if not md5_valid: + return self.response('Unauthorized') + + sale_order = request.env['sale.order'].sudo().search_read([('id', '=', id)], ['name']) + pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'sale.report_saleorder')])._render_qweb_pdf([id]) + if pdf and len(sale_order) > 0: + return rest_api.response_attachment({ + 'content': pdf, + 'mimetype': 'application/pdf', + 'filename': sale_order[0]['name'] + }) + return self.response('Dokumen tidak ditemukan', code=404) + @http.route(PREFIX_PARTNER + 'sale_order//cancel', auth='public', method=['POST', 'OPTIONS'], csrf=False) def partner_cancel_sale_order(self, **kw): user_token = self.authenticate() diff --git a/indoteknik_api/models/rest_api.py b/indoteknik_api/models/rest_api.py index 0a15aad1..65119b52 100644 --- a/indoteknik_api/models/rest_api.py +++ b/indoteknik_api/models/rest_api.py @@ -1,7 +1,9 @@ from odoo import models +from odoo.http import request import datetime from pytz import timezone import hashlib +import base64 class RestApi(models.TransientModel): @@ -17,4 +19,29 @@ class RestApi(models.TransientModel): return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() def md5_salt_valid(self, value, salt, token): - return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() == token \ No newline at end of file + return hashlib.md5((salt + '$' + str(value)).encode()).hexdigest() == token + + def get_single_attachment(self, model, field, id): + domain = [ + ('res_model', '=', model), + ('res_field', '=', field), + ('res_id', '=', id), + ] + fields = ['datas', 'mimetype'] + result = self.env['ir.attachment'].sudo().search_read(domain, fields) + return result[0] if len(result) > 0 else None + + def response_attachment(self, data = {}): + decode_content = data.get('decode_content', False) + if decode_content: + data['content'] = base64.b64decode(data['content']) + + return request.make_response( + data['content'], + [ + ('Content-Type', data['mimetype']), + ('Content-Disposition', 'attachment; filename=%s' % data['filename']), + ('Content-Length', len(data['content'])) + ] + ) + \ No newline at end of file diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index cc2f9586..c3f3dccb 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -6,11 +6,13 @@ class SaleOrder(models.Model): def api_v1_single_response(self, sale_order, context=False): data = { + 'token': self.env['rest.api'].md5_salt(sale_order.id, 'sale.order'), 'id': sale_order.id, 'name': sale_order.name, 'sales': sale_order.user_id.name, 'amount_total': sale_order.amount_total, 'purchase_order_name': sale_order.partner_purchase_order_name, + 'purchase_order_file': True if sale_order.partner_purchase_order_file else False, 'invoice_count': sale_order.invoice_count, 'status': 'draft', } @@ -32,7 +34,6 @@ class SaleOrder(models.Model): if context == 'with_detail': res_users = self.env['res.users'] data_with_detail = { - 'purchase_order_file': True if sale_order.partner_purchase_order_file else False, 'payment_term': sale_order.payment_term_id.name or '', 'date_order': self.env['rest.api'].datetime_to_str(sale_order.date_order, '%d/%m/%Y %H:%M:%S'), 'products': [], -- cgit v1.2.3 From 7af09e5b533f76ea12c8b68185c3b904f2aecec9 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 09:17:44 +0700 Subject: add ip_address in user.activity.log --- indoteknik_custom/models/user_activity_log.py | 1 + indoteknik_custom/views/user_activity_log.xml | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 32b389a1..1a1a84fa 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -11,6 +11,7 @@ class UserActivityLog(models.Model): page_title = fields.Char(string="Judul Halaman") url = fields.Char(string="URL") + ip_address = fields.Char('IP Address') res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") diff --git a/indoteknik_custom/views/user_activity_log.xml b/indoteknik_custom/views/user_activity_log.xml index db242505..70a8f0dd 100755 --- a/indoteknik_custom/views/user_activity_log.xml +++ b/indoteknik_custom/views/user_activity_log.xml @@ -9,6 +9,7 @@ + @@ -22,11 +23,12 @@ - - - - - + + + + + + -- cgit v1.2.3 From 6a306691dd4f5c3ea74c1979802217d5f7091247 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 10:07:27 +0700 Subject: add ip address lookup in user activity log --- indoteknik_custom/models/user_activity_log.py | 13 +++++++++++++ indoteknik_custom/views/user_activity_log.xml | 15 ++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 1a1a84fa..90d18068 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -1,6 +1,8 @@ from odoo import models, fields from datetime import datetime, timedelta import logging, re +import requests +import json _logger = logging.getLogger(__name__) @@ -12,11 +14,22 @@ class UserActivityLog(models.Model): page_title = fields.Char(string="Judul Halaman") url = fields.Char(string="URL") ip_address = fields.Char('IP Address') + ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup") res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") product_id = fields.Many2one('product.template', string='Product') + def _compute_ip_address_lookup(self): + for log in self: + if log.ip_address: + try: + ipinfo = requests.get('https://ipinfo.io/%s/json' % log.ip_address).json() + del ipinfo['readme'] + log.ip_address_lookup = json.dumps(ipinfo, indent=4, sort_keys=True) + except: + log.ip_address_lookup = '' + def compile_product(self): logs = self.env['user.activity.log'].search([ ('email', '!=', False), diff --git a/indoteknik_custom/views/user_activity_log.xml b/indoteknik_custom/views/user_activity_log.xml index 70a8f0dd..f3112e27 100755 --- a/indoteknik_custom/views/user_activity_log.xml +++ b/indoteknik_custom/views/user_activity_log.xml @@ -19,16 +19,17 @@ user.activity.log.form user.activity.log -
+ - - - - - - + + + + + + + -- cgit v1.2.3 From f5f6c879b46f19361e43d921a319353144233085 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 10:13:58 +0700 Subject: store ip address lookup in user activity log --- indoteknik_custom/models/user_activity_log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 90d18068..a7c13993 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -14,7 +14,7 @@ class UserActivityLog(models.Model): page_title = fields.Char(string="Judul Halaman") url = fields.Char(string="URL") ip_address = fields.Char('IP Address') - ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup") + ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup", store=True) res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") @@ -22,7 +22,7 @@ class UserActivityLog(models.Model): def _compute_ip_address_lookup(self): for log in self: - if log.ip_address: + if log.ip_address and not log.ip_address_lookup: try: ipinfo = requests.get('https://ipinfo.io/%s/json' % log.ip_address).json() del ipinfo['readme'] -- cgit v1.2.3 From 59b5cbc1cab6a736de031cf6232294b19629342e Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 10:22:06 +0700 Subject: fix compute if ip_address_lookup store=true --- indoteknik_custom/models/user_activity_log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index a7c13993..478ba119 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -1,4 +1,4 @@ -from odoo import models, fields +from odoo import models, fields, api from datetime import datetime, timedelta import logging, re import requests @@ -20,6 +20,7 @@ class UserActivityLog(models.Model): update_product = fields.Boolean(string="Update Product") product_id = fields.Many2one('product.template', string='Product') + @api.depends('ip_address') def _compute_ip_address_lookup(self): for log in self: if log.ip_address and not log.ip_address_lookup: -- cgit v1.2.3 From effec70a2069499a7289d942759db06af113fc9a Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 10:25:13 +0700 Subject: disable create and edit in user activity log --- indoteknik_custom/views/user_activity_log.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/views/user_activity_log.xml b/indoteknik_custom/views/user_activity_log.xml index f3112e27..9964620a 100755 --- a/indoteknik_custom/views/user_activity_log.xml +++ b/indoteknik_custom/views/user_activity_log.xml @@ -4,7 +4,7 @@ user.activity.log.tree user.activity.log - + @@ -19,7 +19,7 @@ user.activity.log.form user.activity.log - + -- cgit v1.2.3 From 5408b3a7214704742f350b483f48c34e1c84a525 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 10:28:45 +0700 Subject: remove store=true in user activity log --- indoteknik_custom/models/user_activity_log.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 478ba119..1bb067ab 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -14,13 +14,12 @@ class UserActivityLog(models.Model): page_title = fields.Char(string="Judul Halaman") url = fields.Char(string="URL") ip_address = fields.Char('IP Address') - ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup", store=True) + ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup") res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") product_id = fields.Many2one('product.template', string='Product') - @api.depends('ip_address') def _compute_ip_address_lookup(self): for log in self: if log.ip_address and not log.ip_address_lookup: -- cgit v1.2.3 From e62b025b68dcba1b079d6e028458d99116f66946 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 13:55:39 +0700 Subject: ip lookup and record request --- .../controller.cpython-38.pyc.3117987094576 | 0 indoteknik_api/controllers/controller.py | 1 + indoteknik_custom/models/user_activity_log.py | 36 ++++++++++++++++------ indoteknik_custom/views/user_activity_log.xml | 12 +++++--- 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 diff --git a/indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 b/indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 new file mode 100644 index 00000000..e69de29b diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py index c90d3ff1..ffa4e24b 100644 --- a/indoteknik_api/controllers/controller.py +++ b/indoteknik_api/controllers/controller.py @@ -86,6 +86,7 @@ class Controller(http.Controller): return time def response(self, data=[], code=200, description='OK'): + request.env['user.activity.log'].record_activity() response = { 'status': { 'code': code, diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 1bb067ab..ad226b74 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -1,4 +1,5 @@ from odoo import models, fields, api +from odoo.http import request from datetime import datetime, timedelta import logging, re import requests @@ -14,21 +15,36 @@ class UserActivityLog(models.Model): page_title = fields.Char(string="Judul Halaman") url = fields.Char(string="URL") ip_address = fields.Char('IP Address') - ip_address_lookup = fields.Text('IP Address Lookup', compute="_compute_ip_address_lookup") + ip_address_lookup = fields.Text('IP Address Lookup') res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") product_id = fields.Many2one('product.template', string='Product') - def _compute_ip_address_lookup(self): - for log in self: - if log.ip_address and not log.ip_address_lookup: - try: - ipinfo = requests.get('https://ipinfo.io/%s/json' % log.ip_address).json() - del ipinfo['readme'] - log.ip_address_lookup = json.dumps(ipinfo, indent=4, sort_keys=True) - except: - log.ip_address_lookup = '' + def _load_ip_address_lookup(self): + domain = [ + ('ip_address', '!=', False), + ('ip_address_lookup', '=', False), + ] + logs = self.search(domain, limit=45, order='create_date asc') + for log in logs: + try: + ipinfo = requests.get('http://ip-api.com/json/%s' % log.ip_address).json() + log.ip_address_lookup = json.dumps(ipinfo, indent=4, sort_keys=True) + except: + log.ip_address_lookup = '' + + def record_activity(self): + try: + httprequest = request.httprequest + self.env['user.activity.log'].sudo().create([{ + 'page_title': request.env['ir.config_parameter'].get_param('web.base.url'), + 'url': httprequest.base_url, + 'ip_address': httprequest.remote_addr + }]) + return True + except: + return False def compile_product(self): logs = self.env['user.activity.log'].search([ diff --git a/indoteknik_custom/views/user_activity_log.xml b/indoteknik_custom/views/user_activity_log.xml index 9964620a..b0082c3b 100755 --- a/indoteknik_custom/views/user_activity_log.xml +++ b/indoteknik_custom/views/user_activity_log.xml @@ -4,12 +4,12 @@ user.activity.log.tree user.activity.log - + + - @@ -27,11 +27,15 @@ - - + + + + + + -- cgit v1.2.3 From 90442b65e48d6a1e09c7bd23c17f478ce25ba0ca Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 13:56:32 +0700 Subject: delete pycache --- .../controllers/__pycache__/controller.cpython-38.pyc.3117987094576 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 diff --git a/indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 b/indoteknik_api/controllers/__pycache__/controller.cpython-38.pyc.3117987094576 deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 241490ce2cc5b9863ec91f127a8e0ee02ca7c2d6 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:07:49 +0700 Subject: increase limit load ip address lookup --- indoteknik_custom/models/user_activity_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index ad226b74..b77be8e9 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -26,7 +26,7 @@ class UserActivityLog(models.Model): ('ip_address', '!=', False), ('ip_address_lookup', '=', False), ] - logs = self.search(domain, limit=45, order='create_date asc') + logs = self.search(domain, limit=100, order='create_date asc') for log in logs: try: ipinfo = requests.get('http://ip-api.com/json/%s' % log.ip_address).json() -- cgit v1.2.3 From be72c0e40c034a4cdc90976ecf081715481fd636 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:11:40 +0700 Subject: decrease limit load ip address lookup --- indoteknik_custom/models/user_activity_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index b77be8e9..7a19edc3 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -26,7 +26,7 @@ class UserActivityLog(models.Model): ('ip_address', '!=', False), ('ip_address_lookup', '=', False), ] - logs = self.search(domain, limit=100, order='create_date asc') + logs = self.search(domain, limit=50, order='create_date asc') for log in logs: try: ipinfo = requests.get('http://ip-api.com/json/%s' % log.ip_address).json() -- cgit v1.2.3 From c346206759c34502362e1c5412ad70408eb51085 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:14:02 +0700 Subject: increase limit load ip address lookup --- indoteknik_custom/models/user_activity_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 7a19edc3..b77be8e9 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -26,7 +26,7 @@ class UserActivityLog(models.Model): ('ip_address', '!=', False), ('ip_address_lookup', '=', False), ] - logs = self.search(domain, limit=50, order='create_date asc') + logs = self.search(domain, limit=100, order='create_date asc') for log in logs: try: ipinfo = requests.get('http://ip-api.com/json/%s' % log.ip_address).json() -- cgit v1.2.3 From 2339c6c6a38fdbb8cee512ae61131d01a1a9c917 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:17:16 +0700 Subject: delete ip lookup status --- indoteknik_custom/models/user_activity_log.py | 1 + 1 file changed, 1 insertion(+) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index b77be8e9..699c9f3b 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -30,6 +30,7 @@ class UserActivityLog(models.Model): for log in logs: try: ipinfo = requests.get('http://ip-api.com/json/%s' % log.ip_address).json() + del ipinfo['status'] log.ip_address_lookup = json.dumps(ipinfo, indent=4, sort_keys=True) except: log.ip_address_lookup = '' -- cgit v1.2.3 From d2fcc3208afcab10502955f2e6554383ff376135 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:29:01 +0700 Subject: listen request on image --- indoteknik_api/controllers/controller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py index ffa4e24b..59885148 100644 --- a/indoteknik_api/controllers/controller.py +++ b/indoteknik_api/controllers/controller.py @@ -150,4 +150,5 @@ class Controller(http.Controller): def get_image(self, model, field, id): model = request.env[model].sudo().search([('id', '=', id)], limit=1) image = model[field] if model[field] else '' + request.env['user.activity.log'].record_activity() return request.make_response(base64.b64decode(image), [('Content-Type', 'image/jpg')]) -- cgit v1.2.3 From ce2f02d9c7b739490787fed76e5a7a6a55f44066 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:37:16 +0700 Subject: fix dont add record if from localhost ip --- indoteknik_custom/models/user_activity_log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 699c9f3b..743abf60 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -38,10 +38,11 @@ class UserActivityLog(models.Model): def record_activity(self): try: httprequest = request.httprequest + ip_address = httprequest.remote_addr if httprequest.remote_addr != '127.0.0.1' else '' self.env['user.activity.log'].sudo().create([{ 'page_title': request.env['ir.config_parameter'].get_param('web.base.url'), 'url': httprequest.base_url, - 'ip_address': httprequest.remote_addr + 'ip_address': ip_address }]) return True except: -- cgit v1.2.3 From 0388c78c3bbe0f5a6325fee7bb7b2e6a7d436a5f Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 14:39:34 +0700 Subject: fix dont add record if from localhost ip --- indoteknik_custom/models/user_activity_log.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 743abf60..879d5402 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -38,12 +38,12 @@ class UserActivityLog(models.Model): def record_activity(self): try: httprequest = request.httprequest - ip_address = httprequest.remote_addr if httprequest.remote_addr != '127.0.0.1' else '' - self.env['user.activity.log'].sudo().create([{ - 'page_title': request.env['ir.config_parameter'].get_param('web.base.url'), - 'url': httprequest.base_url, - 'ip_address': ip_address - }]) + if httprequest.remote_addr != '127.0.0.1': + self.env['user.activity.log'].sudo().create([{ + 'page_title': request.env['ir.config_parameter'].get_param('web.base.url'), + 'url': httprequest.base_url, + 'ip_address': httprequest.remote_addr + }]) return True except: return False -- cgit v1.2.3 From 7478616937cff56ccb994138831f90eae904e724 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Tue, 7 Feb 2023 16:54:09 +0700 Subject: user activity log detail --- indoteknik_custom/models/user_activity_log.py | 34 +++++++++++++++++++++++++++ indoteknik_custom/views/user_activity_log.xml | 10 ++++++++ 2 files changed, 44 insertions(+) diff --git a/indoteknik_custom/models/user_activity_log.py b/indoteknik_custom/models/user_activity_log.py index 879d5402..9d9694af 100755 --- a/indoteknik_custom/models/user_activity_log.py +++ b/indoteknik_custom/models/user_activity_log.py @@ -16,11 +16,44 @@ class UserActivityLog(models.Model): url = fields.Char(string="URL") ip_address = fields.Char('IP Address') ip_address_lookup = fields.Text('IP Address Lookup') + ip_location_city = fields.Text('IP Location City') + ip_location_country = fields.Text('IP Location Country') + ip_location_country_code = fields.Text('IP Location Country Code') + ip_location_map = fields.Html('Embedded Map', compute='_compute_ip_location_map', sanitize=False) res_user_id = fields.Many2one("res.users", string="User") email = fields.Char(string="Email") update_product = fields.Boolean(string="Update Product") product_id = fields.Many2one('product.template', string='Product') + def _parse_json(self, json_string, key): + result = '' + if json_string: + json_object = json.loads(json_string) + if key in json_object: + result = json_object[key] + return result + + def _compute_ip_location_map(self): + self.ip_location_map = "" + ip_location_lat = self._parse_json(self.ip_address_lookup, 'lat') + ip_location_lon = self._parse_json(self.ip_address_lookup, 'lon') + url = 'https://maps.google.com/maps?q=%s,%s&hl=id&z=15&output=embed' % (ip_location_lat, ip_location_lon) + if ip_location_lat and ip_location_lon: + self.ip_location_map = "" + + def _parse_ip_location(self): + domain = [ + ('ip_address_lookup', '!=', False), + ('ip_location_city', '=', False), + ('ip_location_country', '=', False), + ('ip_location_country_code', '=', False), + ] + logs = self.search(domain, limit=200, order='create_date asc') + for log in logs: + log.ip_location_city = self._parse_json(log.ip_address_lookup, 'city') + log.ip_location_country = self._parse_json(log.ip_address_lookup, 'country') + log.ip_location_country_code = self._parse_json(log.ip_address_lookup, 'countryCode') + def _load_ip_address_lookup(self): domain = [ ('ip_address', '!=', False), @@ -34,6 +67,7 @@ class UserActivityLog(models.Model): log.ip_address_lookup = json.dumps(ipinfo, indent=4, sort_keys=True) except: log.ip_address_lookup = '' + self._parse_ip_location() def record_activity(self): try: diff --git a/indoteknik_custom/views/user_activity_log.xml b/indoteknik_custom/views/user_activity_log.xml index b0082c3b..b8792ee8 100755 --- a/indoteknik_custom/views/user_activity_log.xml +++ b/indoteknik_custom/views/user_activity_log.xml @@ -32,9 +32,19 @@ + + + + + + + + + + -- cgit v1.2.3