There are too many image sizes. Since they are stored resized this takes time to generate when saving a new image, it's more rows on the attachment table, more files on the disk, ... 64px is close enough to 128px that it can be removed without a big impact on download size. It will even reduce download and number of requests when both images are displayed because now only one has to be downloaded and then benefit from cache. The difference between the two is typically around 1.5kB which is negligible these days, especially when the request overhead is around 0.5kB already, not even taking into account other factors such as latency. If a 64px image must absolutely be returned, it is still possible to pass the size parameters to the image route. But the current guideline is to handle resizing in the views when necessary. Views ===== - remove width and height attributes when existing CSS rules are overriding them (eg. `.oe_kanban_avatar` in the right context) - add CSS rules instead of width and height attributes when possible - use `object-fit: cover;` where width and height are forced to avoid distortion of non-square images - for products, use `object-fit: contain;` instead, keep ratio but without crop - add new CSS rules where the expected size was max 64px*64px before due to the image size itself - remove `img-fluid` where using size classes to avoid conflicting rules task-2060865 closes odoo/odoo#36147 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
140 lines
6.0 KiB
Python
140 lines
6.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import _, http, fields
|
|
from odoo.exceptions import AccessError
|
|
from odoo.http import request
|
|
from odoo.osv import expression
|
|
from odoo.tools import float_round, float_repr
|
|
|
|
|
|
class LunchController(http.Controller):
|
|
@http.route('/lunch/infos', type='json', auth='user')
|
|
def infos(self, user_id=None):
|
|
self._check_user_impersonification(user_id)
|
|
user = request.env['res.users'].browse(user_id) if user_id else request.env.user
|
|
|
|
infos = self._make_infos(user, order=False)
|
|
|
|
lines = self._get_current_lines(user.id)
|
|
if lines:
|
|
lines = [{'id': line.id,
|
|
'product': (line.product_id.id, line.product_id.name, float_repr(float_round(line.product_id.price, 2), 2)),
|
|
'toppings': [(topping.name, float_repr(float_round(topping.price, 2), 2))
|
|
for topping in line.topping_ids_1 | line.topping_ids_2 | line.topping_ids_3],
|
|
'quantity': line.quantity,
|
|
'price': line.price,
|
|
'state': line.state, # Only used for _get_state
|
|
'note': line.note} for line in lines]
|
|
raw_state, state = self._get_state(lines)
|
|
infos.update({
|
|
'total': float_repr(float_round(sum(line['price'] for line in lines), 2), 2),
|
|
'raw_state': raw_state,
|
|
'state': state,
|
|
'lines': lines,
|
|
})
|
|
return infos
|
|
|
|
@http.route('/lunch/trash', type='json', auth='user')
|
|
def trash(self, user_id=None):
|
|
self._check_user_impersonification(user_id)
|
|
user = request.env['res.users'].browse(user_id) if user_id else request.env.user
|
|
|
|
lines = self._get_current_lines(user.id)
|
|
lines.action_cancel()
|
|
lines.unlink()
|
|
|
|
@http.route('/lunch/pay', type='json', auth='user')
|
|
def pay(self, user_id=None):
|
|
self._check_user_impersonification(user_id)
|
|
user = request.env['res.users'].browse(user_id) if user_id else request.env.user
|
|
|
|
lines = self._get_current_lines(user.id)
|
|
if lines:
|
|
lines = lines.filtered(lambda line: line.state == 'new')
|
|
|
|
lines.action_order()
|
|
return True
|
|
|
|
return False
|
|
|
|
@http.route('/lunch/payment_message', type='json', auth='user')
|
|
def payment_message(self):
|
|
return {'message': request.env['ir.qweb'].render('lunch.lunch_payment_dialog', {})}
|
|
|
|
@http.route('/lunch/user_location_set', type='json', auth='user')
|
|
def set_user_location(self, location_id, user_id=None):
|
|
self._check_user_impersonification(user_id)
|
|
user = request.env['res.users'].browse(user_id) if user_id else request.env.user
|
|
|
|
user.sudo().last_lunch_location_id = request.env['lunch.location'].browse(location_id)
|
|
return True
|
|
|
|
@http.route('/lunch/user_location_get', type='json', auth='user')
|
|
def get_user_location(self, user_id=None):
|
|
self._check_user_impersonification(user_id)
|
|
user = request.env['res.users'].browse(user_id) if user_id else request.env.user
|
|
|
|
user_location = user.last_lunch_location_id
|
|
has_multi_company_access = not user_location.company_id or user_location.company_id.id in request._context.get('allowed_company_ids', request.env.company.ids)
|
|
|
|
if not user_location or not has_multi_company_access:
|
|
return request.env['lunch.location'].search([], limit=1).id
|
|
return user_location.id
|
|
|
|
def _make_infos(self, user, **kwargs):
|
|
res = dict(kwargs)
|
|
|
|
is_manager = request.env.user.has_group('lunch.group_lunch_manager')
|
|
|
|
currency = user.company_id.currency_id
|
|
|
|
res.update({
|
|
'username': user.sudo().name,
|
|
'userimage': '/web/image?model=res.users&id=%s&field=image_128' % user.id,
|
|
'wallet': request.env['lunch.cashmove'].get_wallet_balance(user, False),
|
|
'is_manager': is_manager,
|
|
'locations': request.env['lunch.location'].search_read([], ['name']),
|
|
'currency': {'symbol': currency.symbol, 'position': currency.position},
|
|
})
|
|
|
|
user_location = user.last_lunch_location_id
|
|
has_multi_company_access = not user_location.company_id or user_location.company_id.id in request._context.get('allowed_company_ids', request.env.company.ids)
|
|
|
|
if not user_location or not has_multi_company_access:
|
|
user.last_lunch_location_id = user_location = request.env['lunch.location'].search([], limit=1)
|
|
|
|
alert_domain = expression.AND([
|
|
[('available_today', '=', True)],
|
|
[('location_ids', 'in', user_location.id)],
|
|
[('mode', '=', 'alert')],
|
|
])
|
|
|
|
res.update({
|
|
'user_location': (user_location.id, user_location.name),
|
|
'alerts': request.env['lunch.alert'].search_read(alert_domain, ['message']),
|
|
})
|
|
|
|
return res
|
|
|
|
def _check_user_impersonification(self, user_id=None):
|
|
if (user_id and request.env.uid != user_id and not request.env.user.has_group('lunch.group_lunch_manager')):
|
|
raise AccessError(_('You are trying to impersonate another user, but this can only be done by a lunch manager'))
|
|
|
|
def _get_current_lines(self, user_id):
|
|
return request.env['lunch.order'].search([('user_id', '=', user_id), ('date', '=', fields.Date.today()), ('state', '!=', 'cancelled')])
|
|
|
|
def _get_state(self, lines):
|
|
"""
|
|
This method returns the lowest state of the list of lines
|
|
|
|
eg: [confirmed, confirmed, new] will return ('new', 'To Order')
|
|
"""
|
|
states_to_int = {'new': 0, 'ordered': 1, 'confirmed': 2, 'cancelled': 3}
|
|
int_to_states = ['new', 'ordered', 'confirmed', 'cancelled']
|
|
translated_states = dict(request.env['lunch.order']._fields['state']._description_selection(request.env))
|
|
|
|
state = int_to_states[min(states_to_int[line['state']] for line in lines)]
|
|
|
|
return (state, translated_states[state])
|