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
|
d5ba73fac7
|
Add the organization part of an address into the transaction and transactionitem. Fixes bug #12088.
|
2011-04-05 15:10:23 -07:00 |
|
Colin Kuskie
|
8525e4b7ee
|
Don't refund transactionItems unless the transaction is successful, or if the item is already canceled. Also, no not call onCancelRecurring for normal Sku's unless they're really recurring. Fixes bug #12089.
|
2011-04-04 14:45:53 -07:00 |
|
Colin Kuskie
|
33592f9dbb
|
Fix taking address information, and the right fields in the transaction item.
|
2010-07-27 23:02:28 -07:00 |
|
Colin Kuskie
|
1689353977
|
Fix a TransactionItem bug inherited from master.
|
2010-07-27 23:01:40 -07:00 |
|
Colin Kuskie
|
d28397fd65
|
Move TransactionItem to Moose.
|
2010-07-15 14:28:22 -07:00 |
|
Patrick Donelan
|
f16ba76b86
|
Merge branch 'WebGUI8' into psgi
Conflicts:
sbin/testEnvironment.pl
|
2010-06-04 21:01:03 -04:00 |
|
Colin Kuskie
|
ae88345e04
|
Revert the sense of the exception handling, to the right state.
|
2010-05-22 22:27:46 -07:00 |
|
Graham Knop
|
5122518652
|
remove useless DESTROYs
|
2010-04-16 20:57:00 -05:00 |
|
Graham Knop
|
2400f19099
|
Merge branch 'master' into WebGUI8
|
2010-04-13 07:50:02 -05:00 |
|
Colin Kuskie
|
ecc71d455d
|
Update Shop for new instanciators and for exception handling.
|
2010-03-03 21:07:38 -08:00 |
|
Colin Kuskie
|
49bd7f5032
|
newByDynamicClass changed to newById
|
2009-12-27 19:08:15 -08:00 |
|
Colin Kuskie
|
0ee4a7fa90
|
Make display of failed transactions more obvious in the Account/Shop plugin.
|
2009-10-19 15:21:39 -07:00 |
|
Martin Kamerbeek
|
9d90b92629
|
Tax details are now stored with the transaction items they belong to.
|
2009-05-08 10:03:25 +00:00 |
|
Martin Kamerbeek
|
7ce918852e
|
Adding vendor payout manager
|
2009-03-13 12:39:29 +00:00 |
|
Graham Knop
|
bf9bd2f0d2
|
use proper JSON encoding/decoding
|
2009-02-10 21:41:36 +00:00 |
|
JT Smith
|
e3d85353e8
|
upgrade related fixes
|
2008-06-12 22:24:07 +00:00 |
|
JT Smith
|
75c44c110f
|
transaction manager working
|
2008-05-20 21:00:00 +00:00 |
|
JT Smith
|
ca9278190e
|
mostly working transaction manager
fixed many bugs
|
2008-05-19 22:17:08 +00:00 |
|
JT Smith
|
6616504077
|
added vendor management
fixed a few privilege statements in some other code
|
2008-04-29 21:25:15 +00:00 |
|
JT Smith
|
8d03655bdb
|
added in-store credit
added refund mechanism
modified ems to use refund mechanism
|
2008-04-20 01:12:25 +00:00 |
|
JT Smith
|
9d99c7e71d
|
registrant management is mostly working
|
2008-04-19 18:25:42 +00:00 |
|
Martin Kamerbeek
|
6edce95ba4
|
Adding the ITransact driver. Partly finished, not yet tested, but compiles.
|
2008-04-02 15:59:32 +00:00 |
|
JT Smith
|
fb17e6375e
|
started on transaction management interface
finished merging new yui
|
2008-03-15 19:39:19 +00:00 |
|
JT Smith
|
02199ff58c
|
transaction backend and tests complete
|
2008-03-14 22:39:38 +00:00 |
|