Commit graph

147 commits

Author SHA1 Message Date
Colin Kuskie
a2a821822d Merge commit 'v7.10.23' into WebGUI8. Tests need fixing. 2011-11-02 11:12:18 -07:00
Colin Kuskie
431cd280a4 Merge commit 'v7.10.22' into WebGUI8 2011-10-31 20:13:01 -07:00
Colin Kuskie
1f9413e2a5 Display an error message anytime the cart is viewed if it has mixed items (recurring and non-recurring, or too many recurring). Fixes bug #12211. 2011-09-12 11:34:38 -07:00
Colin Kuskie
36f818ed5e Check for mixed items in the cart AFTER processing delete requests. Fixes bug #12239. 2011-08-30 08:45:57 -07:00
Colin Kuskie
428ea58327 Add better support for user profile fields for addresses to the Cart and the EMS. 2011-08-11 16:27:29 -07:00
Colin Kuskie
3b7dd524db When a Sku is purged, delete it from all carts. Better handling for cartItems whose assets have been deleted. Fixes bug #12213 2011-08-02 10:00:53 -07:00
Doug Bell
795d88e7e5 Merge commit 'v7.10.17' into 8
Conflicts:
	docs/upgrades/upgrade_7.9.13-7.10.0.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/AssetReport.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Form/Captcha.pm
	lib/WebGUI/Macro/AdminBar.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/PayDriver.pm
	lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Workflow/Instance.pm
	lib/WebGUI/Workflow/Spectre.pm
	lib/WebGUI/i18n/English/PayDriver.pm
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Wobject/Thingy.t
2011-06-17 20:13:41 -05:00
Colin Kuskie
8bc944d526 Prevent the PayPal standard driver from being abused. Update POD and comments in several Shop files. Fix form labels for PayPal Express checkout driver. Fix a niggling bug with updating a transaction with a cart, twice. Fixes bug #12140.
commit cef8c5bde10f793db0890dcfd18cbf20b0e69c90
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Tue May 24 11:52:48 2011 -0700

    Build a Shop::Transaction.

commit c386079ac29fc70c1cc63d0c2844511ce9db553e
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Tue May 24 11:34:13 2011 -0700

    Pull a session out of the object.

commit 59d780eb0ffcc82572491f85f08eb4ac04cab109
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Tue May 24 11:15:05 2011 -0700

    Rework PayPalStd driver to create transaction before sending the user off to PayPal.

commit cd2683aa8595875f7c501f29c622abaf350e90f6
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Tue May 24 11:14:19 2011 -0700

    Fix some comments to be more cleanly readable.

commit cf1fecfb916906c4d8ec8d33bd85c59b0aea3b7c
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Tue May 24 11:13:52 2011 -0700

    Make the transaction optional when displaying a payment error.

commit f3c949e03a18ac513938f2ed483002c5304663d5
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Mon May 23 19:19:56 2011 -0700

    Remove dead code.

commit 5ddcb49f094fd054f79da38c4a95dd86c55a157f
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Thu May 19 11:31:15 2011 -0700

    If a transaction is updated with a cart object, remove all transationItems from the transaction before adding new ones.

commit 3315cb30a5c1fd4d583ce352cbc9022e52544404
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Thu May 19 11:30:58 2011 -0700

    Remove duplicate entries from ExpressCheckout i18n

commit b46d5af528d7223d12ecbed383e798cfc376ad2a
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Mon May 23 16:07:33 2011 -0700

    Fix the version number of the PayPal API we send.  Add the serialized request to the log file.  Fix i18n labels so it's clear which username and password to use.

commit 1604d375822eb013c633b72993fa524703a72127
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Wed May 18 15:50:42 2011 -0700

    Fix copy/paste errors from other i18n modules into ExpressCheckout.

commit f2c958fc7128348a18a005bfbadf83457861d6e2
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Wed May 18 11:26:15 2011 -0700

    Update out of date POD about checking out.

commit 61ca80b15701733a1a7c7eae5d825b161e0c71c1
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Mon May 23 16:05:09 2011 -0700

    Fix documentation in appendCartVariables, and return the hash instead of $self.

commit d3b7341c44c924f395f8594c8ae77d8187170c9f
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Mon May 23 16:03:20 2011 -0700

    Remove variables that were not being used.

commit 2913f96182a7630bce01998bb022d3ebf4842171
Author: Colin Kuskie <colink@perldreamer.com>
Date:   Mon May 16 21:05:54 2011 -0700

    Pull isRecurring directly from the Cart if creating/updating a transaction from one.
2011-05-24 11:57:16 -07:00
Colin Kuskie
52294139a0 -0.00 ne 0.00. Handle both cases of ~0 when checking out to intercept and finish the transaction immediately. 2011-05-19 08:58:44 -07:00
Doug Bell
277faae8a1 Merge commit 'v7.10.15' into 8
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Event.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/RichEdit.pm
	lib/WebGUI/Asset/Sku/Product.pm
	lib/WebGUI/Asset/Snippet.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	lib/WebGUI/Asset/Wobject/Collaboration.pm
	lib/WebGUI/Asset/Wobject/Dashboard.pm
	lib/WebGUI/Asset/Wobject/DataForm.pm
	lib/WebGUI/Asset/Wobject/Folder.pm
	lib/WebGUI/Asset/Wobject/Map.pm
	lib/WebGUI/Asset/Wobject/Search.pm
	lib/WebGUI/Asset/Wobject/Shelf.pm
	lib/WebGUI/Asset/Wobject/StockData.pm
	lib/WebGUI/Asset/Wobject/StoryTopic.pm
	lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Asset/Wobject/WeatherData.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetCollateral/DataForm/Entry.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetMetaData.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	lib/WebGUI/Cache/CHI.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Fork/ProgressBar.pm
	lib/WebGUI/Form/JsonTable.pm
	lib/WebGUI/Form/TimeField.pm
	lib/WebGUI/Form/Zipcode.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/International.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Macro/FileUrl.pm
	lib/WebGUI/Operation/SSO.pm
	lib/WebGUI/Operation/User.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Shop/TransactionItem.pm
	lib/WebGUI/Test.pm
	lib/WebGUI/URL/Content.pm
	lib/WebGUI/URL/Uploads.pm
	lib/WebGUI/User.pm
	lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
	lib/WebGUI/Workflow/Activity/SendNewsletters.pm
	lib/WebGUI/i18n/English/Asset.pm
	lib/WebGUI/i18n/English/WebGUI.pm
	sbin/installClass.pl
	sbin/rebuildLineage.pl
	sbin/search.pl
	sbin/testEnvironment.pl
	t/Asset/Asset.t
	t/Asset/AssetClipboard.t
	t/Asset/AssetLineage.t
	t/Asset/AssetMetaData.t
	t/Asset/Event.t
	t/Asset/File.t
	t/Asset/File/Image.t
	t/Asset/Post/notification.t
	t/Asset/Sku.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Wobject/Collaboration/templateVariables.t
	t/Asset/Wobject/Collaboration/unarchiveAll.t
	t/Asset/Wobject/Shelf.t
	t/Auth.t
	t/Macro/EditableToggle.t
	t/Macro/FilePump.t
	t/Shop/Cart.t
	t/Shop/Transaction.t
	t/Storage.t
	t/User.t
	t/Workflow.t
2011-05-13 18:15:11 -05:00
Colin Kuskie
5c175c42d9 If there is a problem with the user's billing address, still let them get into the Cart. Fixes bug #12081. 2011-03-31 16:56:09 -07:00
Martin Kamerbeek
b22ed80dc7 Fixed #12007: Hardcoded js in cart view. 2010-12-23 16:45:15 +00:00
Martin Kamerbeek
10ea82d6ec Don't let the cart crash on invalid addressIds 2010-12-22 13:31:16 +00:00
Martin Kamerbeek
f748aa1b83 Return a list of shipper to choose from in stead of none if no shipper has be chosen yet. 2010-12-22 13:11:56 +00:00
Colin Kuskie
fd8f03a186 Change getMimeType and setMimeType to response->content_type. 2010-11-21 22:35:26 -08:00
Colin Kuskie
59c03b50e7 Change occurances of user->profileField to user->get 2010-11-18 16:12:03 -08:00
Colin Kuskie
0180b11064 Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0 2010-09-22 07:58:06 -07:00
Colin Kuskie
5765739a95 Labels in the Cart for addresses are optional. They take the first line of the address if left blank. Tested w and w/o JS. 2010-09-01 12:22:55 -07:00
Colin Kuskie
7b218942b3 Merge commit '63865eb39f' into WebGUI8. up to 7.9.11 2010-08-13 11:52:08 -07:00
Colin Kuskie
be42b7118c Migrate CartItem from Class::InsideOut to Moose. 2010-08-05 16:24:10 -07:00
Doug Bell
c931cab85c fix #11755: New cart does not update shipping 2010-07-29 17:33:02 -05:00
Doug Bell
3ae21d6349 Merge remote branch 'upstream/WebGUI8' into 8-merge 2010-07-14 18:26:42 -05:00
Doug Bell
708b47d73c Merge remote branch 'upstream/WebGUI8' into 8-merge
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/Navigation.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/Config.pm
	lib/WebGUI/Form/Template.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/VersionTag.pm
	lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
	t/AdSpace.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/Story.t
	t/Asset/Template/HTMLTemplateExpr.t
	t/Asset/Wobject/Gallery/00base.t
	t/Asset/Wobject/GalleryAlbum/00base.t
	t/Asset/Wobject/GalleryAlbum/ajax.t
	t/Asset/Wobject/InOutBoard.t
	t/Asset/Wobject/StoryArchive.t
	t/Asset/Wobject/Survey/ExpressionEngine.t
	t/Asset/Wobject/Survey/Reports.t
	t/AssetAspect/RssFeed.t
	t/Auth/mech.t
	t/Group.t
	t/Mail/Send.t
	t/Operation/AdSpace.t
	t/Session/ErrorHandler.t
	t/Session/Scratch.t
	t/Session/Url.t
	t/Shop/Cart.t
	t/Shop/Pay.t
	t/Shop/Ship.t
	t/Shop/ShipDriver.t
	t/Shop/TaxDriver/Generic.t
	t/Shop/Vendor.t
	t/VersionTag.t
	t/lib/WebGUI/Test.pm
2010-07-14 18:20:00 -05:00
Colin Kuskie
04a16ed87c Move Shop/Transaction to Moose. Change core modules to suit. 2010-07-14 14:50:39 -07:00
Doug Bell
babfa74209 Merge branch 'master' into 8-merge
Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
	lib/WebGUI/Asset/Wobject/Navigation.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/Config.pm
	lib/WebGUI/Form/Template.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Inbox.pm
	lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
	lib/WebGUI/Workflow/Activity/TrashExpiredEvents.pm
	sbin/testEnvironment.pl
	t/AdSpace.t
	t/AdSpace/Ad.t
	t/Asset/Asset.t
	t/Asset/AssetExportHtml.t
	t/Asset/AssetLineage.t
	t/Asset/EMSSubmissionForm.t
	t/Asset/Event.t
	t/Asset/File/GalleryFile/Photo/00base.t
	t/Asset/File/GalleryFile/Photo/comment.t
	t/Asset/File/GalleryFile/Photo/download.t
	t/Asset/File/GalleryFile/Photo/edit.t
	t/Asset/File/GalleryFile/Photo/exif.t
	t/Asset/File/GalleryFile/Photo/makeResolutions.t
	t/Asset/File/GalleryFile/Photo/makeShortcut.t
	t/Asset/File/Image/setfile.t
	t/Asset/File/setfile.t
	t/Asset/Post.t
	t/Asset/Post/Thread/getAdjacentThread.t
	t/Asset/Sku.t
	t/Asset/Sku/ProductCollateral.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Template/HTMLTemplateExpr.t
	t/Asset/Wobject/Gallery/00base.t
	t/Asset/Wobject/GalleryAlbum/00base.t
	t/Asset/Wobject/GalleryAlbum/ajax.t
	t/Asset/Wobject/GalleryAlbum/delete.t
	t/Asset/Wobject/Matrix.t
	t/Asset/Wobject/StoryArchive.t
	t/Asset/Wobject/Survey/ExpressionEngine.t
	t/Asset/Wobject/Survey/Reports.t
	t/AssetAspect/RssFeed.t
	t/Auth/mech.t
	t/Config.t
	t/Group.t
	t/Help/isa.t
	t/International.t
	t/Mail/Send.t
	t/Operation/AdSpace.t
	t/Operation/Auth.t
	t/Pluggable.t
	t/Session.t
	t/Session/DateTime.t
	t/Session/ErrorHandler.t
	t/Session/Scratch.t
	t/Session/Stow.t
	t/Shop/Cart.t
	t/Shop/Pay.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/PayPalStd.t
	t/Shop/Ship.t
	t/Shop/ShipDriver.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Shop/Transaction.t
	t/Shop/Vendor.t
	t/VersionTag.t
	t/Workflow/Activity/ArchiveOldStories.t
	t/Workflow/Activity/ExpireIncompleteSurveyResponses.t
	t/lib/WebGUI/Test.pm
2010-07-09 11:48:30 -05:00
Colin Kuskie
9ebcc0a87a Finish C::IO cleanup, strip out create guts. 2010-07-08 09:44:25 -07:00
Colin Kuskie
4cbbed3509 Allow creationDate to be settable in the Cart. 2010-07-07 15:52:16 -07:00
Colin Kuskie
a1f1bf450a Move Cart to Moose.
Remove the global AddressBook cache, replace it with a per-object cache.  Merge create into
new, but leave a create stub for legacy code.
2010-07-07 15:30:47 -07:00
Colin Kuskie
565cf955d7 Merge commit '469c2b72b4' into WebGUI8. All tests passing. 2010-07-01 10:13:22 -07:00
Colin Kuskie
89e20a3073 Fix how the cart handles items with shipping, added to the cart by visitor. Fixes bug #11693. 2010-06-30 09:00:24 -07:00
Colin Kuskie
385931aaab Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing. 2010-06-27 22:32:31 -07:00
Colin Kuskie
e5b82bc861 Merge commit '4969f31e1f' into WebGUI8 2010-06-26 14:37:31 -07:00
Colin Kuskie
5febc0ebbc Merge commit '41575d24bb' into webgui8. Some tests still failing.
Conflicts:
	docs/gotcha.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/File/GalleryFile/Photo.pm
	lib/WebGUI/Asset/Post.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/WikiPage.pm
	lib/WebGUI/Asset/Wobject/WikiMaster.pm
	lib/WebGUI/Cache.pm
	lib/WebGUI/Content/Setup.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Pay.pm
	lib/WebGUI/Shop/PayDriver/ITransact.pm
	sbin/testEnvironment.pl
	t/Asset/WikiPage.t
	t/Shop/PayDriver.t
	t/Shop/PayDriver/ITransact.t
	t/Shop/PayDriver/Ogone.t
	t/Shop/TaxDriver/EU.t
	t/Shop/TaxDriver/Generic.t
	t/Workflow/Activity/RemoveOldCarts.t
	t/lib/WebGUI/Test.pm
2010-06-25 23:25:26 -07:00
Colin Kuskie
6ac0aa936c Update Shop::Ship to use Moose instead of C::IO. Update tests, and core code. Provide a shim for the old syntax. 2010-06-24 13:41:07 -07:00
Colin Kuskie
8283243823 Allow visitor to remove items from their cart. Fixes bug #11667 2010-06-22 08:27:38 -07:00
Colin Kuskie
760abafd9c Put back a www_checkout method, to be used by the Payment plugin when displaying upstream errors. Fixes bug #11584. 2010-05-24 11:05:33 -07:00
Colin Kuskie
bd41360ad4 Internationalize all cart error messages. 2010-05-10 19:21:57 -07:00
Colin Kuskie
22d6806dfe Better UI for changing addresses. Prevent bad things from happening if the user delete required fields. 2010-05-10 17:19:01 -07:00
Colin Kuskie
f04cf29300 Fix display of the shop credit deduction when there's a recurring item in the cart. Fixes bug #11557 2010-05-05 18:29:03 -07:00
Colin Kuskie
eb9d32f6f5 Log the correct transaction data on a $0 checkout. 2010-05-05 17:28:33 -07:00
Colin Kuskie
113c44ada8 Give the cart an id for the JS to work with. 2010-05-05 16:36:31 -07:00
Colin Kuskie
984003123c Shade the buttons with CSS. Don't show per-item shipping if there's only 1 item in the cart. 2010-05-04 10:20:31 -07:00
Paul Driver
e26723f526 handling per-item shipping dropdowns in js 2010-05-03 17:06:11 -07:00
Colin Kuskie
d92347bf34 Use a method rather than reinventing the getPaymentGateway method. 2010-05-02 18:13:25 -07:00
Colin Kuskie
0179930011 Give the perItem dropdowns the same class name. 2010-04-30 16:45:09 -07:00
Colin Kuskie
cb8c8da1ac Per item shipping. 2010-04-30 16:42:10 -07:00
Paul Driver
9a827affc4 Updating shipping/tax info based on address 2010-04-30 11:03:59 -07:00
Colin Kuskie
9ab13fb524 Document how and why we handle $0 checkouts 2010-04-30 08:51:30 -07:00
Colin Kuskie
d986496131 Code tweaks and comments for clarity. 2010-04-30 08:48:22 -07:00
Colin Kuskie
85978eeb23 Remove totalPrice since it was in there twice 2010-04-29 18:15:24 -07:00