Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PORT] website_sale_add_to_cart: 11.0 #237

Merged
merged 12 commits into from
Nov 23, 2017
Merged

[PORT] website_sale_add_to_cart: 11.0 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
180e344
[PORT] website_sale_add_to_cart: 11.0
KolushovAlexandr Nov 9, 2017
373c24b
[DOC] added index, changelog
KolushovAlexandr Nov 9, 2017
58d3278
[LINT]
KolushovAlexandr Nov 10, 2017
1f57ba9
[CI] added tour
KolushovAlexandr Nov 10, 2017
3a379c9
[FIX] json request refinement
KolushovAlexandr Nov 14, 2017
40b3edc
[CI] last step in test about printing was changed
KolushovAlexandr Nov 14, 2017
72a7844
[CI] fixes
KolushovAlexandr Nov 16, 2017
52ed6ba
[LINT] new line
KolushovAlexandr Nov 16, 2017
e6243dd
[FIX] conflicts after merging in main branch
KolushovAlexandr Nov 23, 2017
d47463e
[FIX] travis.yml
KolushovAlexandr Nov 23, 2017
55f78e9
Merge branch '11.0-website_sale_add_to_cart-port' of github.com:Kolus…
KolushovAlexandr Nov 23, 2017
b8355c4
[FIX] incorrect selector
KolushovAlexandr Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python

python:
- "2.7"
- "3.5"

sudo: false
cache: pip
Expand All @@ -15,7 +15,7 @@ addons:

env:
global:
- VERSION="10.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
- VERSION="11.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
- WEBSITE_REPO="1"
- PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
- TRANSIFEX_USER='i18n-bot@it-projects.info'
Expand All @@ -28,9 +28,6 @@ env:
- TESTS="1" ODOO_REPO="odoo/odoo"
- TESTS="1" ODOO_REPO="OCA/OCB"

virtualenv:
system_site_packages: true

install:
- pip install anybox.testing.openerp
- git clone https://github.com/it-projects-llc/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
Expand Down
2 changes: 1 addition & 1 deletion website_sale_add_to_cart/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Quick add items to shopping cart

Description: https://apps.odoo.com/apps/modules/8.0/website_sale_add_to_cart/

Tested on Odoo 8.0 f8d5a6727d3e8d428d9bef93da7ba6b11f344284
Tested on Odoo 11.0 c7171795f891335e8a8b6d5a6b796c28cea77fea
1 change: 0 additions & 1 deletion website_sale_add_to_cart/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import controllers
3 changes: 1 addition & 2 deletions website_sale_add_to_cart/__openerp__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
{
'name': 'Quick add items to shopping cart',
'version': '1.0.0',
Expand All @@ -14,5 +13,5 @@
'data': [
'website_sale_add_to_cart_views.xml',
],
'installable': False
'installable': True
}
1 change: 0 additions & 1 deletion website_sale_add_to_cart/controllers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import website_sale_add_to_cart
1 change: 0 additions & 1 deletion website_sale_add_to_cart/controllers/website_sale_add_to_cart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-

from odoo import http
from odoo.http import request
Expand Down
4 changes: 2 additions & 2 deletions website_sale_add_to_cart/static/src/js/website_sale_add_to_cart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $(document).ready(function () {
}
var update_json = $.Deferred();
update_json.resolve();
$(".quick_add_to_cart > input.form-control").change(function () {
$(".input-group > input.form-control").change(function () {
var $input = $(this);
update_json = update_json.then(function(){
var value = parseInt($input.val(), 10);
Expand Down Expand Up @@ -51,7 +51,7 @@ $(document).ready(function () {
});
*/

if (page_product_id){
if (page_product_id) {
$('input.form-control.js-quantity').val(0);
}
ajax.jsonRpc("/shop/get_order_numbers", 'call').then(function(data){
Expand Down
2 changes: 0 additions & 2 deletions website_sale_add_to_cart/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# -*- coding: utf-8 -*-

from . import test_add_to_cart
2 changes: 0 additions & 2 deletions website_sale_add_to_cart/tests/test_add_to_cart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

import odoo.tests


Expand Down