Commit Graph

52 Commits

Author SHA1 Message Date
chm@openerp.com c10800f2f1 [FIX] website_event_sale: multi tickets
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
chm@openerp.com 0bae967baa [MERGE] from trunk
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
Christophe Matthieu b994ae4938 [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)
bzr revid: chm@openerp.com-20140227160519-eakqgm2zwrxseya7
2014-02-27 17:05:19 +01:00
Christophe Matthieu 07b5cb38a0 [IMP] website_sale: refactoring: website_event_sale: fix for refactoring
bzr revid: chm@openerp.com-20140225125736-dni507i8xpz1b61j
2014-02-25 13:57:36 +01:00
Christophe Matthieu 1d4f8783b5 [IMP] website_sale: some fix and imp
bzr revid: chm@openerp.com-20140221172816-5bb5l9z2xsvswz8u
2014-02-21 18:28:16 +01:00
Christophe Matthieu bfeb2b9631 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
jke-openerp 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
Antony Lesuisse ff37d0ebca website sale refactor
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
Antony Lesuisse 4aa8eadf5f [REN] rename product characterisic into attributes
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +01:00
Christophe Matthieu 70090a12ba [FIX] website_sale
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Christophe Matthieu 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
ddm 4d24f84615 [IMP] Ensure correct parsing
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00
Thibault Delavallée 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
Thibault Delavallée 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
Christophe Matthieu 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
Thibault Delavallée 32897bf4ee [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
Christophe Matthieu 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
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00
ddm 02217abc1f [FIX] Checkout form almost functional
bzr revid: ddm@openerp.com-20131113184303-0i6rtjxbavb9znxz
2013-11-13 19:43:03 +01:00
Thibault Delavallée 35619dfe12 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
Christophe Matthieu 25f6d1c83f [IMP] website_sale: header change for user customization
bzr revid: chm@openerp.com-20131107135306-8jpe0gl4iqmgl51k
2013-11-07 14:53:06 +01:00
Christophe Matthieu 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
Thibault Delavallée 15ec0ebb62 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
Fabien Meghazi 7dd1934585 [FIX] option typo: unable_editor -> enable_editor
bzr revid: fme@openerp.com-20131023091152-h0hxw47hzfor2al8
2013-10-23 11:11:52 +02:00
Xavier Morel 3655f43e42 [IMP] warnings and shit
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
2013-10-22 17:11:44 +02:00
Christophe Matthieu 6e4c0f9068 [WIP] website_sale use payment_acquirer
bzr revid: chm@openerp.com-20131016150837-1zo80gd1pmlvy2im
2013-10-16 17:08:37 +02:00
Christophe Matthieu 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
Christophe Matthieu 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
Christophe Matthieu 16a3aa522b [IMP] website_sale: variant change the price
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
Christophe Matthieu adef9bc3df [FIX] website_sale: edit, suggested products
bzr revid: chm@openerp.com-20131002162810-cjo5r9itmuc0x71o
2013-10-02 18:28:10 +02:00
Christophe Matthieu d2a743cbde [IMP] website_sale: context, routes
bzr revid: chm@openerp.com-20131002071239-4glhz7g8iz1r9gea
2013-10-02 09:12:39 +02:00
Christophe Matthieu 6e3a9e63b7 [FIX] website_sale: hack link with javascript
bzr revid: chm@openerp.com-20130927134028-f2nl4xinq0zd0rb7
2013-09-27 15:40:28 +02:00
Christophe Matthieu 45190a6f7d [FIX] website_sale: reload page after edit size
bzr revid: chm@openerp.com-20130927110146-obp9tcolk8pdq82x
2013-09-27 13:01:46 +02:00
Christophe Matthieu da8c4e1be1 [IMP] website_sale: sweeter style and size edition on view 'list'
bzr revid: chm@openerp.com-20130927103148-nwm0amgkn8buk4dd
2013-09-27 12:31:48 +02:00
Christophe Matthieu 9b538b3744 [FIX] website_sale: add to cart
bzr revid: chm@openerp.com-20130926140750-tmp5wexrpbkipt0w
2013-09-26 16:07:50 +02:00
Christophe Matthieu 9f58a5c082 [IMP] website_sale: add styles selector on product
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
Christophe Matthieu c66c5d5b6a [IMP] change publish button, fix website_sale product order + push top/bottom
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Christophe Matthieu cb8bdad1ec [FIX] website_sale: reduce qty
bzr revid: chm@openerp.com-20130910115159-qdmhi4rdmxqz5cm3
2013-09-10 13:51:59 +02:00
Christophe Matthieu 7fee8f5609 [IMP] website: change footer xml
bzr revid: chm@openerp.com-20130905092927-2aixeyk1z5ot4oku
2013-09-05 11:29:27 +02:00
Christophe Matthieu a837eb1ba8 [FIX] website_sale: add product; update product number in cart
bzr revid: chm@openerp.com-20130905080407-4pwjvo1hxabf1a2r
2013-09-05 10:04:07 +02:00
Christophe Matthieu 7704ce7e03 [IMP] website_sale: add product in website
bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399
2013-09-04 10:49:58 +02:00
Christophe Matthieu 2dfe9f2bed [IMP] website_sale: add javascript for add/remove to basket for usability
bzr revid: chm@openerp.com-20130903123438-h0lg0ufouovc09f3
2013-09-03 14:34:38 +02:00
Christophe Matthieu 8314c4ef9d [IMP] website_sale: prduct boxes have the same size
bzr revid: chm@openerp.com-20130903082814-uuh11ttoyvjpvjox
2013-09-03 10:28:14 +02:00
Christophe Matthieu 85736a0c6a [IMP] website_sale: layout of publisher
bzr revid: chm@openerp.com-20130902155431-fkx8b29k7r1qpkp4
2013-09-02 17:54:31 +02:00
Christophe Matthieu 9183757380 [FIX] website_event vs website_sale: variation of ticket price with pricelist if the ticket have the same price of the product. If the price is different, do not change the price of the ticket
bzr revid: chm@openerp.com-20130902104646-argn1gu8rk2p1w7a
2013-09-02 12:46:46 +02:00
Christophe Matthieu 651e511ed9 [IMP] website_sale: fix context value, get order line name insead of product name, wip payment
bzr revid: chm@openerp.com-20130823094017-90m72xi2oif4qkuj
2013-08-23 11:40:17 +02:00
Christophe Matthieu 370fa231bf [IMP] website_sale: add price for variation and price_list for reduction
bzr revid: chm@openerp.com-20130822142735-n1aglt9wakj27dsb
2013-08-22 16:27:35 +02:00
Christophe Matthieu 39d5bced7f [IMP] website: refact. javascript,xml for website publish button
bzr revid: chm@openerp.com-20130814083439-wvc07n0sg2vblq1y
2013-08-14 10:34:39 +02:00