0b58afc52e031c2f91172b5dbb4f50a4fa3ecf46 David North davidnorth@gmail.com http://github.com/schof/spree/commit/02e37aa12b14e0aae18b80a803f2af79b94196da 02e37aa12b14e0aae18b80a803f2af79b94196da 2009-12-11T10:50:25-08:00 2009-12-09T09:01:38-08:00 Implement FSM for shipments as well as polymorphic StateEvents. [#953 state:resolved] efaf960a06ac9a1aeffe76ad49b6a41d7b8bcbda Sean Schofield sean@railsdog.com c54dc6e1e57045405c1bc390cd96440cf2f2c7a9 Brian Quinn briandquinn@gmail.com http://github.com/schof/spree/commit/ba1e688ddf3022c610ce3d7eb72bd1f1570938bc ba1e688ddf3022c610ce3d7eb72bd1f1570938bc 2009-12-07T08:45:46-08:00 2009-12-07T08:45:46-08:00 Adds the ability to maintain adjustments for orders via admin backend. [#944 state:resolved] 60fec089244e739a714ea3619501bd6bb043ab5f Brian Quinn briandquinn@gmail.com 40c5598ece6b20d0f270a5fe9519c8b618054e48 Brian Quinn briandquinn@gmail.com http://github.com/schof/spree/commit/14f5c79b6c0dc71dca2314a1caabf0c66d328477 14f5c79b6c0dc71dca2314a1caabf0c66d328477 2009-11-04T10:23:10-08:00 2009-11-04T10:23:10-08:00 Ensure AR errors are displayed on add/update of cart [#862 state:resolved] f12af0e50e40b1b92b623ff13df3b359898a733b Brian Quinn briandquinn@gmail.com 28f2cee1ac2fe2499e241d7d3c5a250385381324 Marcin Raczkowski marcin.raczkowski@gmail.com http://github.com/schof/spree/commit/ece1f03ffe84b28203d1a24697bace90b4129d85 ece1f03ffe84b28203d1a24697bace90b4129d85 2009-10-25T15:13:00-07:00 2009-10-21T06:34:53-07:00 Charge refactoring This commit introduces a lot of changes, all should be backwards compatible, except for change of behaviour of charge recalculating for completed orders. - Separate TaxCharge and ShippingCharge back into separate classes inheriting from common Charge < Adjustment - Separate CouponCredit nto separate class and inherit from Credit < Adjustment as a step for implementing other credit types - Introduce #applicable? method for Adjustment to determine if charge is still applicable for order. - After amount for adjustment is saved(during Order#complete), it's no longer recalculated, so it can be adjusted by hand - updated fixtures and factories to produce new types of charges - introduced test to check new adjustment functionality - removed 'secondary_type' column since it's no longer needed - Moved the completed_at to order model from checkout These changes are more in line with my initial charges design, they solve problem of charges beeing recalculated after order is completed, should be much easier to extend (by simple sublclasing of either Charge Adjustment or Credit), previous approach required overriding of parent class when adding new charge/credit type. [#841 state:resolved] [#765 state:resolved] 09eb97ceb4635d35e614672805083388b13dec40 Sean Schofield schof@apache.org d70a9a26052d12a70e3be575d2c51fdfb35e60d2 Sean Schofield sean@railsdog.com http://github.com/schof/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 08e4e49f12733fa9ec28f5e111bc9e77032b205f paulcc paulcc.two@gmail.com http://github.com/schof/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 eb549bca109fa6cf71005c84830c1227dc45a6d2 paulcc paulcc.two@gmail.com http://github.com/schof/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 03d62b315e8a9f6bbc383fee37fb8c255fb3f7b9 Sean Schofield sean@railsdog.com http://github.com/schof/spree/commit/8203cf7024d0bfc336a335ffa958351de2c5fa09 8203cf7024d0bfc336a335ffa958351de2c5fa09 2009-09-22T06:12:58-07:00 2009-09-09T12:32:17-07:00 Hide non-zero charges in the order summary during checkout. [#727 state:resolved] 0c56082570601c0f74311c441e28d486d09e6d5a Sean Schofield sean@railsdog.com 3227f7edd9a2b3475945e5aaa6a15f4c5d773387 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/f4bda7b611c2802c27891e640a97dedb25c7004d f4bda7b611c2802c27891e640a97dedb25c7004d 2009-09-02T17:39:55-07:00 2009-09-02T17:39:55-07:00 Switched the line_item stuff from attribute_fu to the superior nested_attributes approach. This fixes pretty much everything. Unposted items are no longer dropped from cart, etc. This will be easier to follow since its the "Rails Way." [#678 state:resolved] [#686 state:resolved] 4ac6fa2bb877dbe12c1a2be06a8cbadafb76ecd6 Sean Schofield schof@apache.org f300513ee40ad2100b9c8899b1dbe97004f67701 Marcin Raczkowski marcin.raczkowski@gmail.com http://github.com/schof/spree/commit/d25898ddc6285bc74e687bd2d35d62ed74ed17fc d25898ddc6285bc74e687bd2d35d62ed74ed17fc 2009-08-24T03:27:00-07:00 2009-08-20T11:31:41-07:00 Adds OrderObserver, to create transactions d1e1e5a47da5606c682994bc395fa32bf0c117dc paulcc paulcc.two@gmail.com db74b7e651c6171fcae018e70b7fa42d2540afa5 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/56ab6e2424af9d75877c548cf0caa7865241701a 56ab6e2424af9d75877c548cf0caa7865241701a 2009-08-20T04:48:35-07:00 2009-08-20T04:48:35-07:00 616 - only allow forms to update quantities in basket this fix uses attr_accessible to allow access to :quantity only (and uses explicit update in model/order.rb in the one place it is needed) Note related issues #677 and #678 [#616 state:resolved] b7ae31ec8e40e6c6b6ff9bb92470cc547072648a paulcc paulcc.two@gmail.com 4b41498640e5e8a4dc13c82f32892e5e439ac31d Sean Schofield sean@railsdog.com http://github.com/schof/spree/commit/ef71c50ea6ce2c9bb7d015b5fde0d3542a42b649 ef71c50ea6ce2c9bb7d015b5fde0d3542a42b649 2009-08-19T19:01:48-07:00 2009-08-19T19:01:48-07:00 Partial fix for some of the issues with coupons. [#676] 8b6b033fa8e17ee202cfd87a33a5f06392c58585 Sean Schofield sean@railsdog.com 195cbcc2fa5533fd7e7ffad2d40f5340ac1e8d95 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/4b41498640e5e8a4dc13c82f32892e5e439ac31d 4b41498640e5e8a4dc13c82f32892e5e439ac31d 2009-08-19T03:14:25-07:00 2009-08-19T03:14:25-07:00 673 - fix broken basket updates This was due to a reload in update_totals wiping any changes from form updates etc. I've opted for the simplest fix for now - remove the reload AND fixed the need for the reload. update_line_items was deleting records but leaving the line_items list unchanged. It now removes the defunct records from the list, thus removing the need for a reload. Dropping the reload should only cause problems if line items get changed independently of the parent order, and I don't believe this occurs in the code. However: rethinking the upload vs save situation is needed, to make this more robust. (Eg can we rely on the order of filters?) 30426d3dde6ac481acda7be123d81ff48a3ff542 paulcc paulcc.two@gmail.com 87d7fd18cf5a9b9c93b9e8e7f86d2e2f5b94e9f9 Marcin Raczkowski marcin.raczkowski@gmail.com http://github.com/schof/spree/commit/0d57e80085b75fdd6d61c3754a9f229dbbc5f930 0d57e80085b75fdd6d61c3754a9f229dbbc5f930 2009-08-12T06:18:08-07:00 2009-07-30T09:45:02-07:00 Refactor charges to use calculators and to be polymorphic [#611 state:resolved] c228332838e991800e3d5cca28f3c1110976f347 Sean Schofield schof@apache.org 943cb93afd2162e3a8944216dd2b779195560ad2 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/4594aec4bbd59c371ba7e7bdbc13b7b360c44a6a 4594aec4bbd59c371ba7e7bdbc13b7b360c44a6a 2009-07-15T08:30:45-07:00 2009-07-01T11:58:35-07:00 Flexible system of credits. [#545 state:resolved milestone:0.8.99] aad07ba71b131406c8bb410fe5aecee258d86df9 Sean Schofield schof@apache.org 496852a6af51fef05ccfe4dc062bcf0f6d2fd625 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/665f22ecdf781d26e6b3ebf361481602c4d3a37c 665f22ecdf781d26e6b3ebf361481602c4d3a37c 2009-07-01T07:16:16-07:00 2009-07-01T07:00:27-07:00 Fixed incorrect order totaling. [#529 state:resolved] ec80cc1505787039dc6404025a3647c59e1771e3 Sean Schofield schof@apache.org d0b1bafd43d1cc8040ffaa9ea375d8a19da027df Sean Schofield schof@apache.org http://github.com/schof/spree/commit/a1809c7fa20f81586212d8f6d6695decd83600b9 a1809c7fa20f81586212d8f6d6695decd83600b9 2009-06-28T18:08:41-07:00 2009-06-28T18:08:41-07:00 Revert "removed attribute => true from option_type, order, product, and property models" This reverts commit 208864aaf1f89623c9c9fb09907f29fe6676c633. [#514] 2c5568862c88fc486518d5b177528f439d123820 Sean Schofield schof@apache.org e80fe0fcfdc30c51458b36fc6603195e45a51f88 Michael Lang mwlang@macdoze.gateway.2wire.net http://github.com/schof/spree/commit/208864aaf1f89623c9c9fb09907f29fe6676c633 208864aaf1f89623c9c9fb09907f29fe6676c633 2009-06-25T13:27:46-07:00 2009-06-25T08:05:29-07:00 removed attribute => true from option_type, order, product, and property models [#514 state:resolved milestone:0.8.99] cc5c75c3f031675645edf4155d0bc2ee5ca53305 Sean Schofield schof@apache.org 0112563ec294c320e2c33ffac144d558b6b743e8 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/0f12041d6412364767d9daec5d5a165f8633053e 0f12041d6412364767d9daec5d5a165f8633053e 2009-06-24T19:22:12-07:00 2009-06-18T13:44:50-07:00 Replaced ship_amount and tax_amount with a flexible system of charges. [#499 state:resolved milestone:0.8.99] 5be2245dc58e9504d351f5f574d827ce3c1479d3 Sean Schofield schof@apache.org bfc5d2ba86b9c3fd176fca4b4cedb9849e1f0453 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/0112563ec294c320e2c33ffac144d558b6b743e8 0112563ec294c320e2c33ffac144d558b6b743e8 2009-06-24T19:14:18-07:00 2009-06-21T17:01:57-07:00 Moved tax_calculator extension into core. [#453] 3a94562353c2b89a0e636b14983e1477392b29f5 Sean Schofield schof@apache.org 302749476e3c58518deb0aa7fcd5b315a7e2b033 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/bfc5d2ba86b9c3fd176fca4b4cedb9849e1f0453 bfc5d2ba86b9c3fd176fca4b4cedb9849e1f0453 2009-06-24T19:11:39-07:00 2009-06-08T13:36:26-07:00 Refactored checkout into its own model and controller to simplify customization and make things more restful. [#477 state:resolved] [#496 state:resolved] c0bb8d1c3120698f4c13f8e5213d920abc7db240 Sean Schofield schof@apache.org ce1aad7bc25c15a794f8f5689efcdbf8c3311b7b 955fa28ec44065416633acc87ab912532ffa2010 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/302749476e3c58518deb0aa7fcd5b315a7e2b033 302749476e3c58518deb0aa7fcd5b315a7e2b033 2009-06-24T17:05:44-07:00 2009-06-24T17:05:44-07:00 Merge branch 'master' into 477-refactor-checkout Conflicts: app/models/order.rb lib/spree/checkout.rb 6a98c80ca441775b4f0fe192e3d1894710881762 Sean Schofield schof@apache.org 11b41c5d27f35cbcf76361e32834bde11aca7692 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/ce1aad7bc25c15a794f8f5689efcdbf8c3311b7b ce1aad7bc25c15a794f8f5689efcdbf8c3311b7b 2009-06-24T17:03:57-07:00 2009-06-08T13:36:26-07:00 Refactored checkout into its own model and controller to simplify customization and make things more restful. [#477 state:resolved] [#496 state:resolved] 5a2fa21c25769f41c748b5362cf84ecda8df6569 Sean Schofield schof@apache.org 32a09c7de09ed999cfd7f2d3cf71f5dd1a28db43 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/64eea427f74bad3a85d6276f5572ed3b493a60d6 64eea427f74bad3a85d6276f5572ed3b493a60d6 2009-06-16T07:41:43-07:00 2009-06-16T07:41:43-07:00 Allow guest user confirmation emails [#491 state:resolved] 1898219c3ca89eb04e3fc092a71590a568ea0ad5 paulcc paulcc.two@gmail.com d777c031a1df9ffd526620d4a30ff54ccc1a1295 paul paul@rocketworks-laptop-one.(none) http://github.com/schof/spree/commit/11b41c5d27f35cbcf76361e32834bde11aca7692 11b41c5d27f35cbcf76361e32834bde11aca7692 2009-06-10T03:28:34-07:00 2009-06-04T00:42:15-07:00 small tweak - use ship mthd's call for calculating rather than diy e0cdad39ddfbcf0b91e24e9bbaa437cfc37990e8 Sean Schofield schof@apache.org 0b0a25879e3b14194b1b969c8775575b269c6050 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/d777c031a1df9ffd526620d4a30ff54ccc1a1295 d777c031a1df9ffd526620d4a30ff54ccc1a1295 2009-06-10T03:28:34-07:00 2009-05-30T03:46:37-07:00 Revision of 4c4daa1a744f8a1bcf841d4b3c7ff9b925369740, to remove the change to the shipping calculator interface (instead, creates a dummy shipment just before doing the calcs) Fix for 463. Revised the checkout process so that creditcard info is held entirely in memory and only persisted (with number/cvv blanked) when the order succeeds; also clarified the get/post behaviour Highlights: * logic for GET/POST/PUT cleaned up, drawing on Ethan Rowe's useful comments in http://groups.google.com/group/spree-user/browse_thread/thread/1500ac8d7d7b2ec3 * creditcard info is stored entirely as an object attribute and not persisted. It is only saved by after being connected to a payment - which is done by authorize() when the request succeeds. * creditcards association removed from order side - need to go through payments now (this is also in preparation for generalising payments to non-cc forms) * the (single) shipment is only created when the order is completed (there's no good reason to have it before, and it did complicate things) * interface to shipping calculator IS UNCHANGED * order.save! now used - silent failure not really an option * relevant admin code, checkout views, and javascript code updated correspondingly 0e3f9648caa07f8616d4c9b49b53a5f1aceaacf9 Sean Schofield schof@apache.org 9e2323847a8127618cda8013dd4be58412d8ad00 paul paul@rocketworks-laptop-one.(none) http://github.com/schof/spree/commit/0b0a25879e3b14194b1b969c8775575b269c6050 0b0a25879e3b14194b1b969c8775575b269c6050 2009-06-10T03:28:34-07:00 2009-06-02T17:14:57-07:00 Revert "Fix for 463. Revised the checkout process so that creditcard info is held entirely in memory and only persisted (with number/cvv blanked) when the order succeeds; also clarified the get/post behaviour" This reverts commit 4c4daa1a744f8a1bcf841d4b3c7ff9b925369740. 389c47612c7bf56da8dbd30693adeab69b75cc54 Sean Schofield schof@apache.org c871a9ebe4bc5fc9c52a46a020497eee8bceb068 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/9e2323847a8127618cda8013dd4be58412d8ad00 9e2323847a8127618cda8013dd4be58412d8ad00 2009-06-10T03:28:34-07:00 2009-05-30T03:46:37-07:00 Fix for 463. Revised the checkout process so that creditcard info is held entirely in memory and only persisted (with number/cvv blanked) when the order succeeds; also clarified the get/post behaviour Highlights: * logic for GET/POST/PUT cleaned up, drawing on Ethan Rowe's useful comments in http://groups.google.com/group/spree-user/browse_thread/thread/1500ac8d7d7b2ec3 * creditcard info is stored entirely as an object attribute and not persisted. It is only saved by after being connected to a payment - which is done by authorize() when the request succeeds. * creditcards association removed from order side - need to go through payments now (this is also in preparation for generalising payments to non-cc forms) * the (single) shipment is only created when the order is completed (there's no good reason to have it before, and it did complicate things) * interface to shipping calculator changed to expect orders instead of shipments (transitional: when we allow multiple shipments, we probably want to calculate for a set of line items and an address - and nothing else). * order.save! now used - silent failure not really an option * relevant admin code, checkout views, and javascript code updated correspondingly 632140d5f0178551a0f3deb80ee0dcbe7b807832 Sean Schofield schof@apache.org 72cf3a6daf50faf24b1ed4a14edf4150bafbfa77 paulcc paulcc.two@gmail.com http://github.com/schof/spree/commit/62bf82f613859b968b0d9227e74013f474596b1a 62bf82f613859b968b0d9227e74013f474596b1a 2009-05-28T07:40:54-07:00 2009-05-28T07:40:54-07:00 fix for #468, now finalises and saves order details _before_ mailing is attempted 907430b6e8897fa8a8d8a29339bde267e05672ba paulcc paulcc.two@gmail.com 61a02a5a19b980efccfd5d5681c11d90822fdc18 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/6a3dae3f650260b0e66e99643f86ad01c95ac858 6a3dae3f650260b0e66e99643f86ad01c95ac858 2009-04-15T14:09:27-07:00 2009-04-15T14:09:27-07:00 Finished up first pass of guest checkout. #338 22364b42720e9149fef117cf357c6cdec22f88a9 Sean Schofield schof@apache.org b7d80e426d51bf1130552172825a61120f5838e8 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/f0cb1bddacddd719d8399f72abcbc0b501a5cc32 f0cb1bddacddd719d8399f72abcbc0b501a5cc32 2009-04-09T07:12:34-07:00 2009-04-02T12:50:32-07:00 Added token access for incomplete orders. #340 e0c12d21b9b204a74aae94f7118328476fcae8fd Sean Schofield schof@apache.org 933f78af4474fc0c28a9162c92b876eb8b66affe Sean Schofield schof@apache.org http://github.com/schof/spree/commit/7d0269b091185b4b75e1d79b5dcf8d35d8c353dd 7d0269b091185b4b75e1d79b5dcf8d35d8c353dd 2009-04-07T18:39:24-07:00 2009-04-07T18:36:13-07:00 Switched from checkout_presenter to new Rails 2.3 nested attributes. #347 5e9d92745a12ce9d28a526ec67b024755053ac35 Sean Schofield schof@apache.org 5040ef5334ffc258e58cb8a686d9fba1cc6d80c6 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/933f78af4474fc0c28a9162c92b876eb8b66affe 933f78af4474fc0c28a9162c92b876eb8b66affe 2009-04-07T10:09:26-07:00 2009-04-07T10:09:26-07:00 Moved shipping calculator and certain shipment functionality into order. 4384f984f64bee287a16f340cbfa41b652c39384 Sean Schofield schof@apache.org 052e0c40132a680df374fd6e5051ebd84c9a5726 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/5040ef5334ffc258e58cb8a686d9fba1cc6d80c6 5040ef5334ffc258e58cb8a686d9fba1cc6d80c6 2009-04-07T09:48:48-07:00 2009-04-06T17:47:52-07:00 Refactored address model and relationships. #345 8499990f9afe920a2bae287901a9b588777c8918 Sean Schofield schof@apache.org 4b51feed80a1e58534d731f5add711575cdc1a37 Sean Schofield schof@apache.org http://github.com/schof/spree/commit/75c119b8178b9e159c96f21cfb4ed477127c2109 75c119b8178b9e159c96f21cfb4ed477127c2109 2009-03-23T07:34:00-07:00 2009-03-23T07:34:00-07:00 Removed the problematic association extension for line_items. #313 26cba2118fbcf89d5e27231e0b7c479f87784b71 Sean Schofield schof@apache.org