Commit Graph

136 Commits

Author SHA1 Message Date
Thibault Delavallée d1bc4d3766 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131120091851-mtln13mmv8amuau7
2013-11-20 10:18:51 +01:00
Christophe Matthieu e41e8f3957 [IMP] website_hr_recruitment: clear url path
bzr revid: chm@openerp.com-20131119161403-wsqwgfi9w3ythjeg
2013-11-19 17:14:03 +01:00
Thibault Delavallée 38a9a3f480 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131119160204-1yvqbg4vgpc0bkqs
2013-11-19 17:02:04 +01:00
Thibault Delavallée 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
Fabien Meghazi 3951af2ab5 [IMP] Content->New Product asks for name of product
bzr revid: fme@openerp.com-20131119113822-ve7bl516xowa7u1f
2013-11-19 12:38:22 +01:00
Christophe Matthieu 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
Thibault Delavallée ba14bbe339 [MOV] website_sale: move get_order and get_current_order code into Website class
and into website specific file.

bzr revid: tde@openerp.com-20131119102921-ie03umd2ozasp798
2013-11-19 11:29:21 +01:00
Thibault Delavallée 5a51562c18 [ADD] website_sale: added website file in controllers, for website specific code
bzr revid: tde@openerp.com-20131119093735-peyoz1ri2hv21w3v
2013-11-19 10:37:35 +01:00
Thibault Delavallée 4d84a4a627 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131119091935-2bhj417353diri9l
2013-11-19 10:19:35 +01:00
Christophe Matthieu 5a6a1efc79 [IMP] website_blog: add breadcrumb; [IMP] clean links
bzr revid: chm@openerp.com-20131118143530-5205sp6q7xp6lbj7
2013-11-18 15:35:30 +01:00
Thibault Delavallée 7237ae3a63 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131118100534-1pw762aklfdt2hwn
2013-11-18 11:05:34 +01:00
Fabien Pinckaers 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
Christophe Matthieu 85014499a5 [IMP] website_sale: domain to display product in shop, overwrited in website_event
bzr revid: chm@openerp.com-20131115160828-pjv3gessa5sxu2ap
2013-11-15 17:08:28 +01:00
Christophe Matthieu b958ece1df [IMP] website_sale: access rights
bzr revid: chm@openerp.com-20131115152716-86wb7yxq2s4hr633
2013-11-15 16:27:16 +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
Thibault Delavallée 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
Christophe Matthieu 3f1ff327ad [FIX] website: access right for demo user
bzr revid: chm@openerp.com-20131114152212-jcmyzbf6zcpkp999
2013-11-14 16:22:12 +01:00
Christophe Matthieu 62f00f6941 [IMP] website_sale: remove product 'Service' from the shop list of products
bzr revid: chm@openerp.com-20131114113845-xgs79iq2eq2bqgmm
2013-11-14 12:38:45 +01:00
ddm 569b6dc220 [Oops] Sorry about that
bzr revid: ddm@openerp.com-20131113202732-0uak3vi7qkf8jts7
2013-11-13 21:27:32 +01:00
ddm 02217abc1f [FIX] Checkout form almost functional
bzr revid: ddm@openerp.com-20131113184303-0i6rtjxbavb9znxz
2013-11-13 19:43:03 +01:00
Fabien Meghazi 7598bcdb98 [ADD] Content menu links splitted per modules
TODO: website.prompt() should be finished for Add a blog post link

Added @id=editable_scripts_hook in layout template so modules can easly add *.editor.js files

bzr revid: fme@openerp.com-20131113171438-3l0wo08ta5vsulq3
2013-11-13 18:14:38 +01:00
Thibault Delavallée 833adcec62 [FIX] website_sale: fixed template about acquirer, when displaying the form of an acquirer
bzr revid: tde@openerp.com-20131113140009-wpa69bbmswyncmoz
2013-11-13 15:00:09 +01:00
Thibault Delavallée ac54e05a21 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131113093009-w6jih5xosequqowh
2013-11-13 10:30:09 +01:00
Fabien Meghazi 91ac20c28c [FIX] Remove lang_code from kwargs
bzr revid: fme@openerp.com-20131112112150-ka9ner1bkqx6ioeg
2013-11-12 12:21:50 +01:00
Thibault Delavallée 92e72bb317 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131112095402-82v28vq537o6le8c
2013-11-12 10:54:02 +01:00
ddm 0b16f685c1 [FIX] beware of multilang when removing **post
bzr revid: ddm@openerp.com-20131108172019-51yymatg4b1zanc1
2013-11-08 18:20:19 +01:00
ddm 4d5a8ed6ab [IMP] cleanup product controller
bzr revid: ddm@openerp.com-20131108164917-0cn91vb1yn822bvi
2013-11-08 17:49:17 +01:00
Christophe Matthieu 9d9b2ed63c [FIX] website_sale: Shopping Cart suggested products
bzr revid: chm@openerp.com-20131108155841-m4b6k02zx8h54ajf
2013-11-08 16:58:41 +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
Fabien Meghazi 01a28b6e03 [FIX] Can't translate menus
context was not passed while setting request.website
forced to refactor a bit in order to make true model methods but stopped
because it will be duplicated work when migrating to the new api

bzr revid: fme@openerp.com-20131107151400-9dmtgz7xs34qmbmq
2013-11-07 16:14:00 +01:00
ddm 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
ddm 5f41d10ab5 [FIX] product links when browsing categories
bzr revid: ddm@openerp.com-20131105162558-4e1yua2hipvf5cly
2013-11-05 17:25:58 +01:00
Christophe Matthieu 67c437df77 [FIX] website_sale: access right for product.attribute.product; white list for filter link
bzr revid: chm@openerp.com-20131105161737-b1o41v17p7wsjl6v
2013-11-05 17:17:37 +01:00
Christophe Matthieu 475c77874b [FIX] website_sale: add filter
bzr revid: chm@openerp.com-20131105151417-zas9dcz5jn0za8st
2013-11-05 16:14:17 +01:00
Christophe Matthieu 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
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
Christophe Matthieu a31847a432 [FIX] website_sale: add access rules for product.pricelist
bzr revid: chm@openerp.com-20131105092801-1vohr6w15cxqj4wp
2013-11-05 10:28:01 +01:00
Thibault Delavallée 420cdb13a2 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
2013-10-31 11:27:49 +01:00
Xavier Morel 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
Thibault Delavallée 15ec0ebb62 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
Thibault Delavallée 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
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
ddm 3873868633 [FIX] Fixed eCommerce pager
bzr revid: ddm@openerp.com-20131022151655-erprk7ci7mrwmb18
2013-10-22 17:16:55 +02:00
Christophe Matthieu 36675c3663 [WIP] payment_acquirer
bzr revid: chm@openerp.com-20131017110046-1b5pmju5q8x3gaz5
2013-10-17 13:00:46 +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 5dd919e930 [IMP] website_sale: replace sql search by openerp domain for attributes searching
bzr revid: chm@openerp.com-20131015093350-a4irzeqiwpn55gh4
2013-10-15 11:33:50 +02:00
Christophe Matthieu 03b360e19f [FIX] website_sale: search by facets/attributes and category
bzr revid: chm@openerp.com-20131015083331-gypew1z1sb4m9jzt
2013-10-15 10:33:31 +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
Fabien Meghazi 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
Christophe Matthieu 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