4dbcf24f19
[IMP] Empty product page
...
bzr revid: fp@tinyerp.com-20140205212452-ktjjx4qcufzlmlqc
2014-02-05 22:24:52 +01:00
706881ab38
[FIX] Proper ticket price micodata
...
bzr revid: ddm@openerp.com-20140205075141-xxedwfwf3lz2v0ej
2014-02-05 08:51:41 +01:00
af2db3b19d
[IMP] Microdata for product
...
bzr revid: ddm@openerp.com-20140203174422-tah5bx94y9mctlei
2014-02-03 18:44:22 +01:00
9e12243350
[IMP] Microdata for product list (+description)
...
bzr revid: ddm@openerp.com-20140203165853-g3nt28nzbe59gbvl
2014-02-03 17:58:53 +01:00
2d4d872300
[IMP] Microdata for product list
...
bzr revid: ddm@openerp.com-20140203165536-5wxskybc50fdd8x3
2014-02-03 17:55:36 +01:00
c18d350468
[FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
...
bzr revid: jke@openerp.com-20140201204741-ygdxaauq0m5axttg
2014-02-01 21:47:41 +01:00
6abf20906e
[Typo] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
...
bzr revid: jke@openerp.com-20140201200413-zww5pcobl6vmvqe1
2014-02-01 21:04:13 +01:00
ff37d0ebca
website sale refactor
...
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
c1739bfb8d
[IMP] product rename suggested to accessory, add alternative to replace recommend
...
bzr revid: al@openerp.com-20140130233240-p0wcs2s57qp9nwp2
2014-01-31 00:32:40 +01:00
4aa8eadf5f
[REN] rename product characterisic into attributes
...
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +01:00
fd6d4d8303
[FIX] Set the good url redirect in "Sign In" button from the cart
...
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
2014-01-30 11:49:37 +01:00
ab8ee396ec
[TYPO] Add space between icon and button in cart "Continue Shopping"
...
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
2014-01-30 10:49:27 +01:00
7027ce6eda
[REF] website_sale : Add missing widget option in recommanded product, to display image
...
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
2014-01-30 10:18:13 +01:00
255fe082bd
[FIX] website_membership: membership displayed order depending on website_sequence
...
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
911d95eabd
[FIX] website_sale: display the line name in my cart
...
bzr revid: chm@openerp.com-20140129095900-iux7i0flrtg1qj2t
2014-01-29 10:59:00 +01:00
5b54fa0061
[IMP] website_event_sale: don't display reduction for product event in my cart
...
bzr revid: chm@openerp.com-20140129094220-alhq9n8eevc3fvbt
2014-01-29 10:42:20 +01:00
d4bbe13963
[REM] t-href is now t-attf-href
...
bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
2014-01-28 21:50:17 +01:00
326c35aecd
[IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
...
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
b25a34ea94
[FIX] website_sale: payment if free
...
bzr revid: chm@openerp.com-20140128163815-ksds4a7zox84glv8
2014-01-28 17:38:15 +01:00
40c7ce4b1c
[REV] Revert t-href and t-action removal
...
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
4a9d1489b3
[CHG] Make templates less readable by removing t-href and t-action
...
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +01:00
316745250b
[FIX] website: public user; website_sale
...
bzr revid: chm@openerp.com-20140128152136-pqh7oqj4drpjk09z
2014-01-28 16:21:36 +01:00
d54ce03f69
[FIX] remove some colgroups, 2 left as they factorize html and all browsers tolerate them
...
bzr revid: al@openerp.com-20140128151359-rtn0d2edyjf8ajk1
2014-01-28 16:13:59 +01:00
07adc071df
[IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
...
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
deddf20919
[FIX] bug in modifying quantities
...
bzr revid: fp@tinyerp.com-20140125204107-jri8u2ucbyuhvzfc
2014-01-25 21:41:07 +01:00
47d8864dc8
[IMP] website_sale: improved manual payment management in checkout process
...
bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
2014-01-24 15:57:13 +01:00
aff2b4973f
[IMP] payment: distinguish manual from automatic payment acquirers.
...
Improved validation (manual/automatic) management in ecommerce.
bzr revid: tde@openerp.com-20140124144355-6aqhocw0nfo7212a
2014-01-24 15:43:55 +01:00
70090a12ba
[FIX] website_sale
...
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
dea946f3dc
[IMP] website_sale: breadcrup
...
bzr revid: chm@openerp.com-20140123130801-ngs1die8rrsakc57
2014-01-23 14:08:01 +01:00
4e68fff52e
[FIX] website_sale: demo data, test, delivery, context pricelist
...
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
2014-01-23 11:47:05 +01:00
3a359f0ef4
[REV] website_sale: reverted changes in shop
...
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +01:00
46c55500ff
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
d724f00198
[FIX] website_sale: promo code
...
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
2014-01-22 13:48:09 +01:00
d944a652dc
[FIX] product: when computing lst_price, that is the public price
...
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.
bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00
363f8561af
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +01:00
ec0f811bd1
[WIP] website_sale: test tour: try to find errors
...
bzr revid: chm@openerp.com-20140121194714-ln6jc2ibqabx3t1l
2014-01-21 20:47:14 +01:00
4ff1af4d01
[FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
...
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
93711b0f91
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +01:00
9ce241349f
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution.
...
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
2014-01-21 11:16:38 +05:30
53d8280f1d
[IMP] website: test class with test for website_sale sale process
...
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
cbbf6f5940
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
a83f1282fa
[IMP] CSS for logo, one pixel better
...
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
2014-01-19 20:35:27 +01:00
379f3fa3ff
[FIX] website_sale: auto set or remove carrier in function of product (service or not)
...
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
2014-01-17 18:38:36 +01:00
bcc307560c
[FIX] website_sale: update price in payement when the user change the delivery method
...
bzr revid: chm@openerp.com-20140117150602-0rdmf0pd2eiocg66
2014-01-17 16:06:02 +01:00
86ec8bd39a
[IMP]removed unnecessary code.
...
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
effa6b282e
[IMP]product: removed attrs from variants in form view.
...
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
f75f2eccef
[IMP]improved template view in website_sale.
...
bzr revid: dka@tinyerp.com-20140117073308-wcyg4q60aj187wek
2014-01-17 13:03:08 +05:30
21c54c95a2
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
...
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
4ff74cbf99
[IMP] website: editor menus is displayed in function of users groups (event, blog...)
...
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
fcf6109d16
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
4e3bed270e
[IMP]improved product template in website_sale.
...
bzr revid: dka@tinyerp.com-20140116120100-m305tam84zvjh0fw
2014-01-16 17:31:00 +05:30
52e4cb3f99
[IMP] website_job: no job offer found message, better template, and fix type
...
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
2014-01-15 17:02:19 +01:00
90248025a4
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
2014-01-15 20:19:40 +05:30
3487d36fc2
[FIX] website_sale: fix boostrap row
...
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
2014-01-15 15:31:39 +01:00
c7bf7ad759
[FIX] website_sale: shiping and invoicing data in red (required) are agressive even the first time
...
bzr revid: chm@openerp.com-20140115131716-zj38n7pl3pnmdzpd
2014-01-15 14:17:16 +01:00
320a0bc28c
[IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
...
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
67f6f54e73
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
d73c8f15b6
[IMP] cleaned CSS, removed CSS
...
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
2014-01-14 22:25:33 +01:00
45feba1f86
[IMP]website_sale: no product message for public users
...
bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
2014-01-14 17:29:25 +01:00
057184bb64
[FIX] website_sale: if I add a suggested product to the card: Page not found wrong url
...
bzr revid: chm@openerp.com-20140114095721-xjj4keju12znfoky
2014-01-14 10:57:21 +01:00
4998764d40
[IMP] website_sale: website_sequence with push to top, push up, push down, push to bottom
...
bzr revid: chm@openerp.com-20140110112442-kmjx97tk6zz5zpwa
2014-01-10 12:24:42 +01:00
8749e13a75
[FIX] website_sale: delivery and payment views
...
bzr revid: chm@openerp.com-20140110102858-57v9dk3hk75c5uu3
2014-01-10 11:28:58 +01:00
a9e87b56ce
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
3f0f6b820b
[FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
...
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
b6517bd5bd
[FIX] website_sale: product template
...
- fixed link to comments
- fixed Comments title + comment form not visible if no previous discussion on the prodcut
bzr revid: tde@openerp.com-20140106171813-rolti0md6xaz1dxd
2014-01-06 18:18:13 +01:00
1053f3c922
[IMP] website_sale: product website chatter: added a title-link for the comment section
...
bzr revid: tde@openerp.com-20140106164434-4d0ddzc1okmfwgrd
2014-01-06 17:44:34 +01:00
3aaa474d3c
[IMP] website_sale: website chatter: some styling on the attachments
...
bzr revid: tde@openerp.com-20140106154358-z3anh1xpdkcmd7wm
2014-01-06 16:43:58 +01:00
0b2d085c1b
[IMP] shop: added openchatter on product shop
...
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
dfd52bfc2c
[FIX] website_sale: fixed several access rights issue related to public user + billing / shipping partner_id of sale order badly set, retrieved and displayed in the checkout process
...
bzr revid: tde@openerp.com-20131224145845-q6255ll7n8wy0syv
2013-12-24 15:58:45 +01:00
7a564f261e
[IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
...
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier
bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
3805a86302
[IMP] website_sale_delivery: make the module effectively works.
...
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
c62e8fc793
[IMP] Small improvements
...
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
b5393c97e4
[IMP] slugify products/categories
...
bzr revid: fp@tinyerp.com-20131214115227-6g3w70pm6cotiqdk
2013-12-14 12:52:27 +01:00
aca3b51bf3
[IMP] website_sale: layout for all theme and mobile view
...
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +01:00
c641d58610
[FIX] website_sale: address layout
...
bzr revid: chm@openerp.com-20131212120232-gsx1h0vk5t91wpcw
2013-12-12 13:02:32 +01:00
796b8bf362
[FIX] website_sale: layout; add push to top in grid
...
bzr revid: chm@openerp.com-20131212114731-9ivgwupic064o3x0
2013-12-12 12:47:31 +01:00
ee370a837c
[IMP] website: Removing unnecessary spaces at beginning of line
...
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
6655cd8ccd
[IMP] website_sale: product placeholder image must be bigger
...
bzr revid: chm@openerp.com-20131212104724-0jmsepf8k5gtl18h
2013-12-12 11:47:24 +01:00
dfe3ca1172
[IMP] website_sale: Rename 'Incl Taxes' into Taxes
...
bzr revid: chm@openerp.com-20131212101442-k1abgkueua4t8iaa
2013-12-12 11:14:42 +01:00
fa217bba33
[IMP] website_sale, website_event: layout
...
bzr revid: chm@openerp.com-20131212101258-tzzyyuz74ysmfn6s
2013-12-12 11:12:58 +01:00
350bda93a6
[IMP] website_sale: empty comment
...
bzr revid: chm@openerp.com-20131211160749-a9f0u00mn4fjx7oe
2013-12-11 17:07:49 +01:00
17e132bb01
[FIX] website: order of script for editor and tours
...
bzr revid: chm@openerp.com-20131211153345-6hand0upjjqba85f
2013-12-11 16:33:45 +01:00
2257e8d431
[IMP] website: change editable and use groups
...
bzr revid: chm@openerp.com-20131211145930-r0izxh9t0efjwhxh
2013-12-11 15:59:30 +01:00
5217c8ebe8
[IMP] website: remove secure_layout. Inherit with groups for js editor
...
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
59906a3af8
[IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
...
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +01:00
b2bd96340f
[FIX] website: create button and help (fix inherit_id in modules)
...
bzr revid: chm@openerp.com-20131205165340-ty0xybh7uz859gnm
2013-12-05 17:53:40 +01:00
1a88541ec5
[FIX] website_sale: filters and partner controller
...
bzr revid: chm@openerp.com-20131205162240-33wfteow79zlbdrn
2013-12-05 17:22:40 +01:00
7a3b490f46
[IMP] preload records and throw 404 if not exists for blog, event, product
...
bzr revid: fme@openerp.com-20131205155450-y6joi29l2cn9amkn
2013-12-05 16:54:50 +01:00
5a2ed4b4b4
[MERGE] [CLEAN] [FIX] payment_acquirer and acquirer implementation: code cleaning + misc bugfixing.
...
[ADD] payment_acquirer: in the rendering, now supported in the context :
- tx_url: the form action URL, that can be set by the context, otherwise fall back on the acquirer default tx URL
- submit_class and submit_txt: submit is now a button with an image, unless asked not to; used in the ecommerce to display a Pay Now button instead of the acquirer logo
- updated all acquirers accordingly.
[IMP] payment_acquirer: cleaned and improved form view, for acquirer and tx models.
[IMP] payment_acquirer: amount and fees are now (16,2) float fields. Updated code to handle this kind of floats. Probably those values should come from some config parameters, but it is still not the case.
[CLEAN] various acquirers: removed unnecessary fields, among other the fields holding URLs. URLs of an acquirer should be accessible through a method, but storing them in a field is wasted space. Updated all acquirers and code accordingly.
[FIX] various acquirers: fixed ckeckout and getting data back processes. Some fixed in the controllers, some fixes in the data management due to prior refactoring and improvements in website and acquirer model.
[IMP] website_sale: updated the choice of the acquirer. They are all displayed with a small image as radio input; a Pay Now button is present to activate the payment process. Actually each acquirer generated a Pay Now button, but only the one of the chosen acquirer is displayed. This rendering uses the new options added in the button rendering process described hereabove.
[REM] website_payment: removed most of the code that was present for testing purposes. Only some JS is kept, for future credit-card form rendering.
bzr revid: tde@openerp.com-20131204175715-gdbl0tp5vbnc6pxm
2013-12-04 18:57:15 +01:00
b1765e2834
[IMP] website: slip layout
...
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
dbcdddd3d4
[MERGE] Sync with website-al, because sale was broken
...
bzr revid: tde@openerp.com-20131204130704-fa3pu4gnpku0frsj
bzr revid: tde@openerp.com-20131204144838-vu66z2lsybqtp4hm
2013-12-04 15:48:38 +01:00
edee3e5da3
[FIX] website_sale: shop/confirm_order: from_partner
...
bzr revid: chm@openerp.com-20131204141056-f4u5rqbbqfka95ka
2013-12-04 15:10:56 +01:00
9f0b5a7c53
[IMP] website_sale: improved the choice of acquirer.
...
Now all acquirer are displayed using a small icon; a Pay Now button is located on the right that
is the next step for the payment.
All acquirers are rendered with a Pay Now button, but only the currently chosen one is
displayed. This allows to display several acquirers without having to do javascript-based
hacks to tune the form, its action or content.
bzr revid: tde@openerp.com-20131204130628-eeqpfhoqaavhv6nk
2013-12-04 14:06:28 +01:00
642fce4a5b
[IMP] speed improvement + small bug
...
bzr revid: fp@tinyerp.com-20131203171033-oe6pkzb9jal3ril8
2013-12-03 18:10:33 +01:00
bc4a7c81bc
[FIX] website_sale: fixes for access right with public user, and access to shopping cart, checkout... without passed by shop index, change url add_cart
...
bzr revid: chm@openerp.com-20131203154422-cwc12og1bgw9j9a8
2013-12-03 16:44:22 +01:00
6745bb3fed
[FIX] font-awesome icons migration to v4
...
bzr revid: fme@openerp.com-20131203141632-ubc35ca7d4l80s7m
2013-12-03 15:16:32 +01:00
37c3ed60f6
[IMP] [WIP] website_sale: beginning of cleaning acquirer choice (should be small icon + pay now button)
...
bzr revid: tde@openerp.com-20131202150218-i403w7ulnm3b7b1n
2013-12-02 16:02:18 +01:00
d376bd55ca
[IMP] url slug in templates
...
bzr revid: fme@openerp.com-20131202125723-aw66fidrinaolgyo
2013-12-02 13:57:23 +01:00
c1f306dd96
[WIP] website: add website_button widget in backend to publish and go back to the website. (need bootstrap 3 for layout)
...
bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53
2013-12-02 13:45:04 +01:00
db8f3b4f40
[IMP] small bugfix
...
bzr revid: fp@tinyerp.com-20131201173208-r72mybhgek0aibfl
2013-12-01 18:32:08 +01:00
d6f77f5853
[IMP] Speed improvements
...
bzr revid: fp@tinyerp.com-20131201172541-p8403347rv08uurh
2013-12-01 18:25:41 +01:00
eeee49bfa8
[IMP] code cleaning '/shop' less SQL queries, WIP
...
bzr revid: fp@tinyerp.com-20131201002355-82l9yab5l4vilkun
2013-12-01 01:23:55 +01:00
32ec9cccdd
[IMP] website: views for drag and drop snippets
...
bzr revid: chm@openerp.com-20131128160851-xmepb4h6n0logclo
2013-11-28 17:08:51 +01:00
d24f8e45b3
[FIX] website_sale: price is displayed twice
...
bzr revid: chm@openerp.com-20131125164506-oitajyqdjnmd02qg
2013-11-25 17:45:06 +01:00
1ae1c0b170
[FIX] website_sale_delivery: inherit view
...
bzr revid: chm@openerp.com-20131125151405-f9k1lzu91ep48hwx
2013-11-25 16:14:05 +01:00
9f2dce4fe0
[IMP]improve product template view and change necessary xpath
...
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
2013-11-22 11:18:50 +05:30
32897bf4ee
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
dc8ef4da30
[FIX] website_sale: fix product editor and move edit code in website_sale.editor.js
...
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
2013-11-21 14:23:17 +01:00
07819834bb
[FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37
...
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
2013-11-21 14:05:29 +01:00
2693636989
[IMP] website_sale: improved checkout process
...
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the
rest of the checkout process
- cleaned confirmation page, removed order details
bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
2013-11-21 13:09:02 +01:00
04818e7584
[FIX] website_sale: fixed some 'add cart' buttons not working
...
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
2013-11-21 10:48:16 +01:00
5dcb10fc01
[IMP] website_sale: end of checkout process improvements
...
- added a controller that validates the payment: confirm the quotation (if paid)
and send it by email
- some fixes in payment routes
- some cleaning in payment template, removed unnecessary code, added a class on a
div to ease the submit button management
bzr revid: tde@openerp.com-20131120140321-mderltwy8xp2vfn4
2013-11-20 15:03:21 +01:00
38a9a3f480
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131119160204-1yvqbg4vgpc0bkqs
2013-11-19 17:02:04 +01:00
4f6e792733
[IMP] website_sale: improved checkout process
...
- now going to shop/confirmation when coming back from the acquirer
- added poll on the confirmation page to wait for data from acquirer
- misc cleaning of checkout process, order and transaction management
- added cancel state on payment.transaction, when canceled by the
customer
bzr revid: tde@openerp.com-20131119160129-fkwkhjvk1bh0uarf
2013-11-19 17:01:29 +01:00
20add62aef
[IMP] website_sale: Remove new button
...
bzr revid: chm@openerp.com-20131119152903-r1h3slpy5vigfor4
2013-11-19 16:29:03 +01:00
910c2657a9
[IMP] website: add a group_website_publisher to Display Editor Bar on Website and other editable option
...
bzr revid: chm@openerp.com-20131119103042-stdyd6r00e1zgli5
2013-11-19 11:30:42 +01:00
7237ae3a63
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131118100534-1pw762aklfdt2hwn
2013-11-18 11:05:34 +01:00
b61ac1998e
[FIX] access right with sale with event crashed [NEW] website_sale_delivery module
...
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00
e61ec3f1cd
[FIX] website_sale: click on blank cd, add to cart -> I have a webcam instead
...
bzr revid: chm@openerp.com-20131115163048-i999l74bfd8t3zrh
2013-11-15 17:30:48 +01:00
419c7c6b32
[FIX] website_sale: ribon
...
bzr revid: chm@openerp.com-20131115160721-btxwlxaj7nf9se5n
2013-11-15 17:07:21 +01:00
b958ece1df
[IMP] website_sale: access rights
...
bzr revid: chm@openerp.com-20131115152716-86wb7yxq2s4hr633
2013-11-15 16:27:16 +01:00
9f38df4d57
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00
28c864b00f
[IMP] website_sale: added basic management of acquirer button in sale.
...
The action of the rendered button is catched, re-routed to a custom controller in sale that
creates the payment.transaction, or fetch an already-existing one.
Once the transaction is found or created, the user is redirected to the acquirer
transaction url.
Next step: display the transaction status in the payment page.
bzr revid: tde@openerp.com-20131115133414-jiob0gkpv106db27
2013-11-15 14:34:14 +01:00
a07adbfc5d
[IMP] Shop tour scaffholding
...
bzr revid: ddm@openerp.com-20131114171736-090vctn8zr30ne8g
2013-11-14 18:17:36 +01:00
9b25f6eb42
[REV] website_sale: removed a change to lessen the diff
...
bzr revid: tde@openerp.com-20131113135947-fq7z0ci0ue92q11w
2013-11-13 14:59:47 +01:00
72ff6562b6
[FIX] website_sale: fixed remaining TREE tag due to conflict
...
bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
2013-11-13 11:43:33 +01:00
ac54e05a21
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131113093009-w6jih5xosequqowh
2013-11-13 10:30:09 +01:00
8a48f25446
[FIX] website_sale: list_view
...
bzr revid: chm@openerp.com-20131112172811-yc0tn0gfz2pvwpb0
2013-11-12 18:28:11 +01:00
557d887496
[IMP] preprocess static @href|src|action, static url doesn't need t-href anymore
...
you need to pull server branch
bzr revid: fme@openerp.com-20131112144442-y9bw5q6kkoym8o1i
2013-11-12 15:44:42 +01:00
35619dfe12
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
ec2a9776ab
[IMP] website_sale: move attributes under add to cart button in product view
...
bzr revid: chm@openerp.com-20131107164522-uauyelduq7o4sfj3
2013-11-07 17:45:22 +01:00
dd497b0ef2
[IMP] website_sale: change name of suggested product template
...
bzr revid: chm@openerp.com-20131107162916-ocm5q101psem5j2v
2013-11-07 17:29:16 +01:00
4ff0a207f6
[IMP] website_sale: some change for attributes
...
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00
28b932a40d
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20131107144828-0wa4vexo5nj41uh5
2013-11-07 15:48:28 +01:00
a4cea5c7eb
[IMP] website_sale: user can display filters without categories
...
bzr revid: chm@openerp.com-20131107143959-551ti1ces04toes0
2013-11-07 15:39:59 +01:00
821f703125
[IMP] use single template for search box in eCommerce
...
bzr revid: ddm@openerp.com-20131107135528-0hovrmuxk51xl8wo
2013-11-07 14:55:28 +01:00
25f6d1c83f
[IMP] website_sale: header change for user customization
...
bzr revid: chm@openerp.com-20131107135306-8jpe0gl4iqmgl51k
2013-11-07 14:53:06 +01:00
9ae2008115
[IMP] website: phone view, hide options and editor buttons
...
bzr revid: chm@openerp.com-20131107112533-o33ok38tbayrdbke
2013-11-07 12:25:33 +01:00
2ae05fb8de
[IMP] website_sale: display message when search returns no result
...
bzr revid: chm@openerp.com-20131107102935-r9212sq6avbhy2o2
2013-11-07 11:29:35 +01:00
b7a4c6d3f0
[FIX] eCommerve search + categories & filters
...
Hopefully this completely solves it. More testing required...
bzr revid: ddm@openerp.com-20131106175743-xxxswsc0vs5fh3x5
2013-11-06 18:57:43 +01:00
5f41d10ab5
[FIX] product links when browsing categories
...
bzr revid: ddm@openerp.com-20131105162558-4e1yua2hipvf5cly
2013-11-05 17:25:58 +01:00
b34bb11b2d
[FIX] avoid building urls manually if possible
...
bzr revid: ddm@openerp.com-20131105155627-ahyo9av7wh1aa7jl
2013-11-05 16:56:27 +01:00
fb5ae3cabf
[FIX] website_sale: mycart when the user haven't sale order
...
bzr revid: chm@openerp.com-20131105155410-pel99sbzka27zl4o
2013-11-05 16:54:10 +01:00
5ce1bfdddf
[FIX] more templates which aren't actually pages
...
bzr revid: xmo@openerp.com-20131105151404-olp8wvdqx9yxuxj9
2013-11-05 16:14:04 +01:00
bf602c18b7
[FIX] cart template is not a page
...
bzr revid: xmo@openerp.com-20131105094953-fdmm1j3k4z1abg92
2013-11-05 10:49:53 +01:00
f318f99825
[IMP] website_sale: attributes/filter, fix access right, add default value for filter (for custom user ecommerce with category,label...)
...
bzr revid: chm@openerp.com-20131105150928-ps01ziqnfgd9hu46
2013-11-05 16:09:28 +01:00
7f5a60f13c
[FIX] website_sale: update total when the user change a product quantity
...
bzr revid: chm@openerp.com-20131105132747-figm8j11d6ul1v0k
2013-11-05 14:27:47 +01:00
420cdb13a2
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
2013-10-31 11:27:49 +01:00
90814d781a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
3a1ed80b41
[FIX] creation of new products from products listing page
...
* fix creation controller to redirect to the id of the *product
template* implicitly created when the product is created, not to the
product, as "product" URLs actually display information about a
product template
* ensure the controller is only POST-ed to, not GET
* fix button to POST the creation request (use form and actual button,
not link)
* fix template (foreach -> t-foreach)
bzr revid: xmo@openerp.com-20131030133019-5pq3qekwu465x1k6
2013-10-30 14:30:19 +01:00
12801a8cbc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
2196a69a61
[FIX] eCommerce: duplicate product price
...
bzr revid: ddm@openerp.com-20131028145043-ek0rnvatu2ab4avx
2013-10-28 15:50:43 +01:00
eb7b1362cd
[WIP] Menu working from database (not yet multi-website)
...
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
15ec0ebb62
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
0467c8a5ab
[FIX] [WIP] website_sale: fix crash when having product templates without variant.
...
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.
[DOC] added some comments because some methods seems quite weird.
bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
2013-10-24 13:04:53 +02:00
3ff98b4050
[IMP] eCommerce: remove duplicate button
...
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
2013-10-24 11:24:38 +02:00
bffc22b391
[IMP] Consistency
...
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
2013-10-24 11:20:57 +02:00
d5379f3b7c
[FIX] eCommerce cart layout
...
Fixed 'Continue Shopping' button spacing when cart empty
bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
2013-10-23 17:46:39 +02:00
7994ceb43d
[IMP] eCommerce: layout improvements
...
bzr revid: ddm@openerp.com-20131022142804-58oabf37w3zsg2pg
2013-10-22 16:28:04 +02:00
1888dea9b4
[IMP] eCommerce: Checkout summary moved to left (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
2013-10-22 16:01:19 +02:00
291ffdb515
[CMS] eCommerce: remove product list title (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022134409-g1qi25a96jvzby8s
2013-10-22 15:44:09 +02:00
31ba0b8b5a
[FIX] image t-field lost during a merge
...
bzr revid: xmo@openerp.com-20131022105955-i550clo5snyvnv26
2013-10-22 12:59:55 +02:00
2771c47379
[FIX] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
666387a274
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
36675c3663
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131017110046-1b5pmju5q8x3gaz5
2013-10-17 13:00:46 +02:00
6e4c0f9068
[WIP] website_sale use payment_acquirer
...
bzr revid: chm@openerp.com-20131016150837-1zo80gd1pmlvy2im
2013-10-16 17:08:37 +02:00
1cec2a5b6f
[REM] Obsolete route /admin
...
bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
2013-10-16 11:32:48 +02:00
110d2d1386
[FIX] website_sale: forgotten files
...
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
f06566baa1
[IMP] website_sale: remove some args in t-keep-query xml attr
...
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
e6a831a1a2
[IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
...
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
853cb1dd26
[MERGE] SEO meta data persistence. New template title handling
...
bzr revid: fme@openerp.com-20131014151509-6bnux7ncvqmy3tea
2013-10-14 17:15:09 +02:00
2cdaa44b9e
[FIX] wrong end tag during merge
...
bzr revid: xmo@openerp.com-20131014095820-njd1v48lgljrj2q0
2013-10-14 11:58:20 +02:00
631b1cbc09
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
2e352ce187
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
a21459d79f
[IMP] demo data
...
bzr revid: fp@openerp.com-20131013190105-5mwo51w7v62tkm89
2013-10-13 21:01:05 +02:00
1ad6132624
[IMP] span[text-decoration] -> del
...
bzr revid: xmo@openerp.com-20131011135550-q4s83cgbb7f8qgof
2013-10-11 15:55:50 +02:00
1208a5bcf5
[ADD] monetary widget use in website_sale
...
bzr revid: xmo@openerp.com-20131011131147-plqmc1r5ok4tcrge
2013-10-11 15:11:47 +02:00
6a37c2fb82
[IMP] Use view 'name' as title for main_object of type ir.ui.view
...
bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
2013-10-10 16:55:25 +02:00
9b40e849d6
[WIP] new title managment in templates. expose main_object for seo
...
bzr revid: fme@openerp.com-20131010132907-xxmg96qmcw9j5f2d
2013-10-10 15:29:07 +02:00
7cfefd4795
[IMP] website_sale: small change in checkout view
...
bzr revid: chm@openerp.com-20131010085141-w6dfki153ob8ke4s
2013-10-10 10:51:41 +02:00
af5cc9c02a
[FIX] website_view: css price with position absolute for description
...
bzr revid: chm@openerp.com-20131009135914-nq5sr4qi7dc5wbsv
2013-10-09 15:59:14 +02:00
41bb68a87b
[FIX] website_view: css responsible < 600
...
bzr revid: chm@openerp.com-20131009134016-chus09j1h0zogbo2
2013-10-09 15:40:16 +02:00
6de0a5d34d
[FIX] website_sale: change view for new qweb security access
...
bzr revid: chm@openerp.com-20131009124848-1n3eiy7dbew6j2js
2013-10-09 14:48:48 +02:00
426757ad92
[ADD] linked image fields
...
bzr revid: xmo@openerp.com-20131008120456-r8tqd5iyq1zfsdvi
2013-10-08 14:04:56 +02:00
d96072fc3a
[IMP] website_sale: on error, label in red color
...
bzr revid: chm@openerp.com-20131003112720-maxy73xo323s3vgl
2013-10-03 13:27:20 +02:00
f5262b9c5c
[IMP] website_sale: icon for policies and Secure Payment; fix my cart label
...
bzr revid: chm@openerp.com-20131003112354-l146jewjuzhlzt7p
2013-10-03 13:23:54 +02:00
6f454c6b33
[IMP] website_sale: shop/mycart, My Cart, in the top
...
bzr revid: chm@openerp.com-20131003110411-9a1536dqwhuhabq7
2013-10-03 13:04:11 +02:00
16a3aa522b
[IMP] website_sale: variant change the price
...
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
adef9bc3df
[FIX] website_sale: edit, suggested products
...
bzr revid: chm@openerp.com-20131002162810-cjo5r9itmuc0x71o
2013-10-02 18:28:10 +02:00
61d6d2dacd
[FIX] crappy publisher change
...
bzr revid: chm@openerp.com-20131002154528-yno7lqkuddidjbis
2013-10-02 17:45:28 +02:00
2ae84ed2e2
[FIX] website_sale: access right for public access for price
...
bzr revid: chm@openerp.com-20131002083018-gavt68w57t9wneu5
2013-10-02 10:30:18 +02:00
d2a743cbde
[IMP] website_sale: context, routes
...
bzr revid: chm@openerp.com-20131002071239-4glhz7g8iz1r9gea
2013-10-02 09:12:39 +02:00
aea15f9f6f
[IMP] website snippet: new change background
...
bzr revid: chm@openerp.com-20131001120335-kwyyodiwturplyfy
2013-10-01 14:03:35 +02:00
08a6ca9d21
[FIX] website_sale: checkout view for public user
...
bzr revid: chm@openerp.com-20131001095117-q9ykymxb2haibi65
2013-10-01 11:51:17 +02:00
8a9938333b
[FIX] website_sale: responsible design of grid of products for firefox
...
bzr revid: chm@openerp.com-20131001090800-i97ojnj2lmi2hg4v
2013-10-01 11:08:00 +02:00
635999b9e9
[IMP] top badge for my cart
...
bzr revid: fp@tinyerp.com-20131001072057-m3551lf4l68b2w1o
2013-10-01 09:20:57 +02:00
656fcad3eb
[IMP] Payment Process Design
...
bzr revid: fp@openerp.com-20130930225105-0dses1tdzm2iysfp
2013-10-01 00:51:05 +02:00
27c9ab5737
[FIX] typo
...
bzr revid: fp@tinyerp.com-20130930083759-gjc0gnv96w0n4kju
2013-09-30 10:37:59 +02:00
3430cef9a4
[IMP] design shop
...
bzr revid: fp@openerp.com-20130929160635-ye56hhpj5ycbzltt
2013-09-29 18:06:35 +02:00
2ecb96c061
[IMP] html fix: row missing
...
bzr revid: fp@openerp.com-20130929154204-xodhyzau24ms0wr6
2013-09-29 17:42:04 +02:00
Fabien Pinckaers
ddm@openerp.com
jke-openerp
Antony Lesuisse
Denis Ledoux
Christophe Matthieu
Fabien Meghazi
Thibault Delavallée
Darshan Kalola (OpenERP)
Fabien Pinckaers
ddm
Xavier Morel