a57ff9248cb24e678e6745dc3388326bed2a50aa dfeffed7259c957f17409693fc3fb4f71d25ba7c AkitaOnRails fabioakita@gmail.com http://github.com/akitaonrails/spree/commit/27469d0c70765d94087d9c1147739d382abfdd53 27469d0c70765d94087d9c1147739d382abfdd53 2009-09-27T16:03:23-07:00 2009-09-27T16:03:23-07:00 Merge branch 'akitaonrails' f6f18e5197e37e8df4a1045f46bb5f48c2cfd252 AkitaOnRails fabioakita@gmail.com 0ed7f41ecea107749bdaf35ec5f93e668d0fa5f0 Sean Schofield schof@apache.org http://github.com/akitaonrails/spree/commit/dfeffed7259c957f17409693fc3fb4f71d25ba7c dfeffed7259c957f17409693fc3fb4f71d25ba7c 2009-09-24T18:12:09-07:00 2009-09-24T18:08:56-07:00 Update statemachine (and move from plugin to gem.) [#780 state:resolved] f3409c012cf2b74754ab296f2fd0a1bf2f62c530 Sean Schofield schof@apache.org 55b24a02dac34d7ba9da1aee4fe0ba4a23c76f53 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/0ed7f41ecea107749bdaf35ec5f93e668d0fa5f0 0ed7f41ecea107749bdaf35ec5f93e668d0fa5f0 2009-09-22T14:53:14-07:00 2009-09-22T14:53:14-07:00 Removed obsolete require statement from payment gateway extension. 77d7330eb9629ba0b805c161426de99642097a51 Sean Schofield sean@railsdog.com 740a6d09f5e5e4f5137cd7180d9cb12101b12ce5 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/55b24a02dac34d7ba9da1aee4fe0ba4a23c76f53 55b24a02dac34d7ba9da1aee4fe0ba4a23c76f53 2009-09-22T14:01:48-07:00 2009-09-22T14:01:48-07:00 Removed legacy javascript file. [#771 state:resolved] e79e9437c5674f3316b090fec1d3f8549813bc5d Sean Schofield sean@railsdog.com dba69433c3677f25a1c4bc68bc927d1cf8ecef2b Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/740a6d09f5e5e4f5137cd7180d9cb12101b12ce5 740a6d09f5e5e4f5137cd7180d9cb12101b12ce5 2009-09-22T13:12:32-07:00 2009-09-22T13:12:32-07:00 Removed defunct application.css file which was not being used. 472b9bc806e6fa3db2ebadbbf7a3f44863ab28ea Sean Schofield sean@railsdog.com 4d188745784728e4f72d17132c7c4902a0401b3b Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/dba69433c3677f25a1c4bc68bc927d1cf8ecef2b dba69433c3677f25a1c4bc68bc927d1cf8ecef2b 2009-09-22T08:26:09-07:00 2009-09-22T08:26:09-07:00 Consolidated common controller logic into Spree::BaseController [#769 state:resolved] 9c8a21894cd06231e87c9a60aba25655cc7e41d9 Sean Schofield sean@railsdog.com fcc6c514dc80cd547f7a6e40296f079b61aad7bc Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/4d188745784728e4f72d17132c7c4902a0401b3b 4d188745784728e4f72d17132c7c4902a0401b3b 2009-09-22T07:34:18-07:00 2009-09-22T07:34:18-07:00 Renamed application controller from application.rb [768 state:resolved] 61270b3f61797dc09745df1b98341c0f0e9dbc34 Sean Schofield sean@railsdog.com 3a0be4b70354e497c304a18e206f188f9b18135f Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/fcc6c514dc80cd547f7a6e40296f079b61aad7bc fcc6c514dc80cd547f7a6e40296f079b61aad7bc 2009-09-22T06:16:46-07:00 2009-09-22T06:16:46-07:00 Fixed typo in rake:upgrade. dd517e335b5c92f341042b11fdeecfdedcdf6f81 Sean Schofield sean@railsdog.com 81fb38f9aac461c4b8c4a87afddca2ea130c6ad6 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/3a0be4b70354e497c304a18e206f188f9b18135f 3a0be4b70354e497c304a18e206f188f9b18135f 2009-09-22T06:13:02-07:00 2009-09-21T14:33:59-07:00 fix typo on option 12f12efaec23943ff0c23cd31edfe14fec43513a Sean Schofield sean@railsdog.com 0dead257a6ffc5a065ae5227a71ad6cbde7955a1 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/81fb38f9aac461c4b8c4a87afddca2ea130c6ad6 81fb38f9aac461c4b8c4a87afddca2ea130c6ad6 2009-09-22T06:13:02-07:00 2009-09-21T12:34:53-07:00 rake db:seed now works properly with gem created store. c764824bbb733412d8d8b1802857e01fb04f4537 Sean Schofield sean@railsdog.com f0c49b5213b974b97dcb7a1d089264708329ebcd Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/0dead257a6ffc5a065ae5227a71ad6cbde7955a1 0dead257a6ffc5a065ae5227a71ad6cbde7955a1 2009-09-22T06:13:02-07:00 2009-09-21T11:32:25-07:00 Removed some unecessary files from the gem. ce4bd38b4050a6206eb82520bc0649ae74331715 Sean Schofield sean@railsdog.com ecf03ea2222df7ada94a0c0549f4e0d41c988959 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/f0c49b5213b974b97dcb7a1d089264708329ebcd f0c49b5213b974b97dcb7a1d089264708329ebcd 2009-09-22T06:13:02-07:00 2009-09-21T11:21:26-07:00 Replaced the 'rake spree:upgrade' task with a new 'spree --u' command to be run from the gem. [#767 state:resolved] d1786ae352fe45c4ab72ecf49b68962eb564d1e9 Sean Schofield sean@railsdog.com 7150524dea0d206ffdc73b5eb7433a9756cb2a5e paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/ecf03ea2222df7ada94a0c0549f4e0d41c988959 ecf03ea2222df7ada94a0c0549f4e0d41c988959 2009-09-22T06:13:02-07:00 2009-09-21T12:15:54-07:00 re-connected special instructions handling the input form was sending the info to the wrong place, and the admin controller now needs to get/set from the checkout value cb5fa62c14c7476eff1c70c50eb3411aafdb99d7 Sean Schofield sean@railsdog.com 277032b0447b35dc35677cfb0367f8c9df9ad45d paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/7150524dea0d206ffdc73b5eb7433a9756cb2a5e 7150524dea0d206ffdc73b5eb7433a9756cb2a5e 2009-09-22T06:13:02-07:00 2009-09-21T07:45:29-07:00 Added charge_total and credit_total to rate hash it's useful for views which don't show full info in their order summaries 8c31460b558dd8209cabffb434e1e16e27f60940 Sean Schofield sean@railsdog.com 228b106181233c07114b6b025d7e2914db04afcc paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/277032b0447b35dc35677cfb0367f8c9df9ad45d 277032b0447b35dc35677cfb0367f8c9df9ad45d 2009-09-22T06:13:02-07:00 2009-09-21T06:36:49-07:00 order confirmation mail now lists all adjustments 50f386eba368efab0556bfd2fe1d0fe30e02337f Sean Schofield sean@railsdog.com bc3fc9fb23cdd483f7de9a454ceb9870d3ed8615 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/228b106181233c07114b6b025d7e2914db04afcc 228b106181233c07114b6b025d7e2914db04afcc 2009-09-22T06:13:02-07:00 2009-09-21T04:54:00-07:00 now copy over config/environments dir in upgrade also removed an apparently defunct css file be613965199567f507328237d40eea1c62e12d03 Sean Schofield sean@railsdog.com df23f8e0013de59cd2a03b40443e692a68ab1301 Sean Schofield schof@apache.org http://github.com/akitaonrails/spree/commit/bc3fc9fb23cdd483f7de9a454ceb9870d3ed8615 bc3fc9fb23cdd483f7de9a454ceb9870d3ed8615 2009-09-22T06:13:02-07:00 2009-09-21T02:57:04-07:00 Do not display credits with amount of zero. 8272a2a3a46cb069195109f9f717fcbab7f0a016 Sean Schofield sean@railsdog.com 543e3e664a11955f35a015c3c9a0459f749bf618 Sean Schofield schof@apache.org http://github.com/akitaonrails/spree/commit/df23f8e0013de59cd2a03b40443e692a68ab1301 df23f8e0013de59cd2a03b40443e692a68ab1301 2009-09-22T06:13:02-07:00 2009-09-21T02:31:58-07:00 Fixed broken tests. 3ff38324d6daadda72ddbb405ccc23ef57e8987e Sean Schofield sean@railsdog.com d70a9a26052d12a70e3be575d2c51fdfb35e60d2 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/543e3e664a11955f35a015c3c9a0459f749bf618 543e3e664a11955f35a015c3c9a0459f749bf618 2009-09-22T06:13:01-07:00 2009-09-20T18:15:32-07:00 Coupons should update amount to 0 after cart is emptied. 580c797bc5f5a3b5f5a22b2a9de8f8ea26f6a89e Sean Schofield sean@railsdog.com a446f0dd6897281fd59d72b71b3735152b22c9e1 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/d70a9a26052d12a70e3be575d2c51fdfb35e60d2 d70a9a26052d12a70e3be575d2c51fdfb35e60d2 2009-09-22T06:13:01-07:00 2009-09-20T06:40:21-07:00 Updated CHANGELOG, CONTRIBUTORS and copyright. 89ab86da1a3d0139f145f80695bc11c44a51a192 Sean Schofield sean@railsdog.com bd3410f0758cccbccf337eacd76528a563b00f1b paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/a446f0dd6897281fd59d72b71b3735152b22c9e1 a446f0dd6897281fd59d72b71b3735152b22c9e1 2009-09-22T06:13:01-07:00 2009-09-19T13:11:58-07:00 use explicit table name in product/variant scopes (cherry picked from commit 27312e345cc0f0f0a035b08aef816c53b2743359) 749224861e3985254635a80231795480a629af5b Sean Schofield sean@railsdog.com 4c9526bb745bb86114340a0c97103d1d7bb3f099 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/bd3410f0758cccbccf337eacd76528a563b00f1b bd3410f0758cccbccf337eacd76528a563b00f1b 2009-09-22T06:13:01-07:00 2009-09-19T11:47:55-07:00 764 - fix name error in report controller also updates a related view to the new searchlogic conventions patch supplied by blythe dunham [#764 state:resolved] 59050a729a470c1f44aef7e7abf94f4739a7e48b Sean Schofield sean@railsdog.com bb5f6bc5b09b169ce7548af0c542df1b870c6cca Brian Quinn briandquinn@gmail.com http://github.com/akitaonrails/spree/commit/4c9526bb745bb86114340a0c97103d1d7bb3f099 4c9526bb745bb86114340a0c97103d1d7bb3f099 2009-09-22T06:13:01-07:00 2009-09-18T11:26:09-07:00 763 - Replaced image admin update button, and other minor repairs to variant images. [#763 state:resolved] 16e3bfa8c37030ff869fa0dd4619c586c274efe3 Sean Schofield sean@railsdog.com 08e4e49f12733fa9ec28f5e111bc9e77032b205f paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/bb5f6bc5b09b169ce7548af0c542df1b870c6cca bb5f6bc5b09b169ce7548af0c542df1b870c6cca 2009-09-22T06:13:01-07:00 2009-09-17T16:24:36-07:00 721 - save line items before recalculating charges charges hard-code the data they depend on, and so do not take updated, in-memory values into account. this fix is a workaround for the immediate bug: it saves the current line items before recomputing the charges. see ticket for more info. [#721 state:patched] e966ebbac9a9cec0f97877e2f32e0a176376997c Sean Schofield sean@railsdog.com fee5a8acf98811d1fc72fc32d2000f05d618f43b paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/08e4e49f12733fa9ec28f5e111bc9e77032b205f 08e4e49f12733fa9ec28f5e111bc9e77032b205f 2009-09-22T06:13:01-07:00 2009-09-17T14:11:12-07:00 755 - move has_calculator to a plugin this is hoped to fix observed issues with recent passenger plus rails 2.3.4 where the registered calculator lists are empty we guess it might be to do with incorrect (re)loading of models in presence of certain kinds of class modification. [#i755 state:patched] 5ddea30e72b721079461c88828722c49aeff9a46 Sean Schofield sean@railsdog.com eb549bca109fa6cf71005c84830c1227dc45a6d2 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/fee5a8acf98811d1fc72fc32d2000f05d618f43b fee5a8acf98811d1fc72fc32d2000f05d618f43b 2009-09-22T06:13:01-07:00 2009-09-17T08:02:15-07:00 557 - reduce silent failures in checkout process This fix gets the save filters to return false if a problem is detected (and so halts the filter chain and save operation), and adds extra checking in the controllers to report if problems are detected. It is expected that the "unexpected error" messages should only arise from system bugs, and thus only rarely be seen by users. Additionally, problems in complete_order are caught and written to the log. Confirmation emails are now sent before the inventory change and final save, just in case there is a bug-related failure later on. [#557 state:resolved] 442bcc737d186969804bbf2a2c21122618e5be41 Sean Schofield sean@railsdog.com 5d5d3bc90c57c6b7ff64d41809ecc7032cc333e1 Sean Schofield schof@apache.org http://github.com/akitaonrails/spree/commit/eb549bca109fa6cf71005c84830c1227dc45a6d2 eb549bca109fa6cf71005c84830c1227dc45a6d2 2009-09-22T06:13:01-07:00 2009-09-16T14:59:22-07:00 Fixed an issue with MySql and legacy migrations. [#732 state:resolved] 61d8618d0c30caad303c4d03b1b43ef90bc1f23c Sean Schofield sean@railsdog.com 30bc4ee51662cb0d6446190e511d3ab5a7a68729 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/5d5d3bc90c57c6b7ff64d41809ecc7032cc333e1 5d5d3bc90c57c6b7ff64d41809ecc7032cc333e1 2009-09-22T06:13:01-07:00 2009-09-16T14:53:35-07:00 fix () warning 6d5dd0f6bd454082157a34f801561c2b9eedb5af Sean Schofield sean@railsdog.com 51a86f88e38a20aca98718431735f8ef6f0b98c4 Sean Schofield sean@railsdog.com http://github.com/akitaonrails/spree/commit/30bc4ee51662cb0d6446190e511d3ab5a7a68729 30bc4ee51662cb0d6446190e511d3ab5a7a68729 2009-09-22T06:13:01-07:00 2009-09-16T07:43:01-07:00 Fixed another issue with 0.8.x to 0.8.99 migration. [#732 state:resolved] 030eb475f4d6ae1e25c6f12263649515fb5f6ef7 Sean Schofield sean@railsdog.com 6c168bbfff039c3320c3756c55b90ebe7d506e16 paulcc paulcc.two@gmail.com http://github.com/akitaonrails/spree/commit/51a86f88e38a20aca98718431735f8ef6f0b98c4 51a86f88e38a20aca98718431735f8ef6f0b98c4 2009-09-22T06:13:01-07:00 2009-09-16T08:17:12-07:00 599 - alter import point for product filter defs this is a workaround for issues with development-mode reloading in rails 2.3.4, and loads the product filter defs (from a library file) directly into the taxon model - which is where they are needed at the moment. [#599 state:resolved] a4ee944cae2336391210a294be9eca6ba5498311 Sean Schofield sean@railsdog.com