oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '41575d24bb' into webgui8. Some tests still failing.

Browse source 
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
This commit is contained in:
Colin Kuskie 2010-06-25 23:25:26 -07:00
commit 5febc0ebbc
258 changed files with 5528 additions and 2230 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/i18n/English.pm
View file

@ -16,7 +16,7 @@ sub makeUrlCompliant {
$value =~ s/^\s+//; #removes leading whitespace
$value =~ s/ /-/g; #replaces whitespace with hyphens
$value =~ s/\.$//; #removes trailing period
$value =~ s/[^A-Za-z0-9\-\.\_\/]//g; #removes all funky characters
$value =~ s/[^\w\-\.\_\/]//g; #removes characters that would interfere with the url
$value =~ s/^\///; #removes a leading /
$value =~ s/\/$//; #removes a trailing /
$value =~ s/\/\//\//g; #removes double /

2
lib/WebGUI/i18n/English/Asset_MapPoint.pm
View file

@ -243,7 +243,7 @@ our $I18N = {
},
'form_fax' => {
message => "A text field for entering in a phone number.",
message => "A text field for entering in a fax number.",
lastUpdated => 0,
context => "template variable help",
},

10
lib/WebGUI/i18n/English/Asset_Template.pm
View file

@ -390,6 +390,16 @@ Any scratch variables will be available in the template with this syntax:<br/>
lastUpdated => 0,
},
'field storageIdExample' => {
message => 'Example Image',
lastUpdated => 0,
},
'field storageIdExample description' => {
message => 'An example image to show what the template looks like before the user selects it',
lastUpdated => 0,
},
};
1;

86
lib/WebGUI/i18n/English/Asset_WikiMaster.pm
View file

@ -537,7 +537,7 @@ listing of pages that are related to a specific keyword?| },
},
'keywords_loop' => {
message => q{A loop containing all the top level keywords, links to their keyword pages, and all sub pages below them.},
message => q{A loop containing all the top level keywords for this page, links to their keyword pages, and all sub pages below them.},
lastUpdated => 0,
context => q{Help for template variable},
},
@ -560,6 +560,12 @@ listing of pages that are related to a specific keyword?| },
context => q{Help for template variable},
},
'keyword descendants' => {
message => q{The number of wiki pages that are tagged with this keyword, and all sub-keywords of this keyword.},
lastUpdated => 0,
context => q{Help for template variable},
},
'indent_loop' => {
message => q{A loop that runs 1 time for each level.},
lastUpdated => 0,
@ -572,6 +578,84 @@ listing of pages that are related to a specific keyword?| },
context => q{Help for template variable},
},
'by keyword template title' => {
message => q{Wiki By Keyword Template Variables},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword keyword' => {
message => q{The keyword that was requested.},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword pagesLoop' => {
message => q{A loop of pages that contain the requested keyword.},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword title' => {
message => q{The title of this page in the loop.},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword url' => {
message => q{The url of this page in the loop.},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword synopsis' => {
message => q{The synopsis of this page in the loop.},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword formHeader' => {
message => q{HTML code to start the form for entering in sub-keywords. This will be empty unless the current user can administer this wiki},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword formFooter' => {
message => q{HTML code to end the form for entering in sub-keywords. This will be empty unless the current user can administer this wiki},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword keywordForm' => {
message => q{HTML code for the field for entering in sub-keywords. This will be empty unless the current user can administer this wiki},
lastUpdated => 0,
context => q{Help for template variable},
},
'by keyword submitForm' => {
message => q{A button to submit the sub-keywords form.},
lastUpdated => 0,
context => q{Help for template variable},
},
'Related Pages' => {
message => q{Related Pages},
lastUpdated => 0,
context => q{template label},
},
'keyword page variables' => {
message => q{Keyword Page Variables},
lastUpdated => 0,
context => q{template variable help},
},
'keyword isTopLevel' => {
message => q{Whether or not the keyword is one of the keywords for the page that was called. For the Wiki Front Page, it will only include top level keywords. For a keyword page, it would be true for any sub-keywords of this page.},
lastUpdated => 0,
context => q{template variable help},
},
};
1;

24
lib/WebGUI/i18n/English/Asset_WikiPage.pm
View file

@ -333,30 +333,6 @@ our $I18N =
context => 'Label for asset property',
},
'isKeywordPage' => {
message => q{A boolean that is true if this page is a keyword page.},
lastUpdated => 0,
context => 'template variable help',
},
'keyword_page_loop' => {
message => q{If this page is a keyword page, then this loop will contain a list of all pages tagged with this page's keyword. The pagination variables will apply to the list of pages in this loop. If this page is not a keyword page, the loop will be blank, and the pagination variables will not be present.},
lastUpdated => 0,
context => 'template variable help',
},
'keyword page title' => {
message => q{The title of a page that has this keyword.},
lastUpdated => 0,
context => 'template variable help',
},
'keyword page url' => {
message => q{The URL to a page that has this keyword. The URL will have the gateway URL prepended to it.},
lastUpdated => 0,
context => 'template variable help',
},
};
1;

27
lib/WebGUI/i18n/English/PayDriver.pm
View file

@ -77,7 +77,7 @@ our $I18N = {
},
'payment methods' => {
message => q|Payment Methods.|,
message => q|Payment Methods|,
lastUpdated => 1213313375,
context => q|Help body for the email receipt template|,
},
@ -93,6 +93,31 @@ our $I18N = {
lastUpdated => 0,
context => q{Link to begin checkout again after failure},
},
'template gone' => {
message => q|The template for entering in credentials has been deleted. Please notify the site administrator.|,
lastUpdated => 0,
context => q|Error message when a template cannot be accessed.|
},
'cart summary variables' => {
message => q|Cart Summary Variables|,
lastUpdated => 0,
context => q|Title for a template variable help page.|
},
'cart summary variables help' => {
message => q|These variables should be available in all PayDriver templates, to display the cart summary to the user.|,
lastUpdated => 0,
context => q|Body for a template variable help page.|
},
'proceedButton' => {
message => q|A combined button and form for the user to press when they have reviewed the charges that will be submitted to this payment gateway.|,
lastUpdated => 0,
context => q|Status message|,
},
};
1;

146
lib/WebGUI/i18n/English/PayDriver_Cash.pm
View file

@ -7,124 +7,13 @@ our $I18N = {
lastUpdated => 0,
context => q|Default Cash payment gateway label|
},
'phone' => {
message => q|Telephone Number|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'country' => {
message => q|Country|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'firstName' => {
message => q|First name|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'lastName' => {
message => q|Last name|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'address' => {
message => q|Address|,
lastUpdated => 1101772170,
context => q|Form label in the checkout form of the iTransact module.|
},
'city' => {
message => q|City|,
lastUpdated => 1101772171,
context => q|Form label in the checkout form of the iTransact module.|
},
'state' => {
message => q|State|,
lastUpdated => 1101772173,
context => q|Form label in the checkout form of the iTransact module.|
},
'zipcode' => {
message => q|Zipcode|,
lastUpdated => 1101772174,
context => q|Form label in the checkout form of the iTransact module.|
},
'email' => {
message => q|Email|,
lastUpdated => 1101772176,
context => q|Form label in the checkout form of the iTransact module.|
},
'cardNumber' => {
message => q|Credit card number|,
lastUpdated => 1101772177,
context => q|Form label in the checkout form of the iTransact module.|
},
'expiration date' => {
message => q|Expiration date|,
lastUpdated => 1101772180,
context => q|Form label in the checkout form of the iTransact module.|
},
'cvv2' => {
message => q|Verification number (ie. CVV2)|,
lastUpdated => 1101772182,
context => q|Form label in the checkout form of the iTransact module.|
},
'vendorId' => {
message => q|Username (Vendor ID)|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'use cvv2' => {
message => q|Use CVV2|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'emailMessage' => {
message => q|Email message|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'module name' => {
message => q|Cash|,
lastUpdated => 0,
context => q|The displayed name of the payment module.|
},
'invalid firstName' => {
message => q|You have to enter a valid first name.|,
lastUpdated => 0,
context => q|An error indicating that an invalid first name has been entered.|
},
'invalid lastName' => {
message => q|You have to enter a valid last name.|,
lastUpdated => 0,
context => q|An error indicating that an invalid last name has been entered.|
},
'invalid address' => {
message => q|You have to enter a valid address.|,
lastUpdated => 0,
context => q|An error indicating that an invalid street has been entered.|
},
'invalid city' => {
message => q|You have to enter a valid city.|,
lastUpdated => 0,
context => q|An error indicating that an invalid city has been entered.|
},
'invalid zip' => {
message => q|You have to enter a valid zipcode.|,
lastUpdated => 0,
context => q|An error indicating that an invalid zipcode has been entered.|
},
'invalid email' => {
message => q|You have to enter a valid email address.|,
lastUpdated => 0,
context => q|An error indicating that an invalid email address has been entered.|
},
'no description' => {
message => q|No description|,
lastUpdated => 0,
@ -158,6 +47,41 @@ our $I18N = {
message => q|When set to 'yes', the transaction is completed when the user submits payment details. When set to 'no', the transaction is set to pending and must be manually set to complete. This may be useful if you wish to allow site visitors to select the Cash Payment method, but would like to wait for payment to clear before completing the transaction.|,
lastUpdated => 0,
},
'summary template' => {
message => q|Summary Template|,
lastUpdated => 0,
context => q|Form label in the configuration form of the Cash module.|
},
'summary template help' => {
message => q|Pick a template to display the screen where the user confirms the cart summary info and agrees to pay.|,
lastUpdated => 0,
context => q|Hover help for the summary template field in the configuration form of the Cash module.|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password help' => {
message => q|The password for your ITransact account.|,
lastUpdated => 0,
context => q|Hover help for the password field in the configuration form of the iTransact module.|
},
'Pay' => {
message => q|Pay|,
lastUpdated => 0,
context => q|Button label|
},
'cart summary template' => {
message => q|Cash Payment Method Cart Summary Template|,
lastUpdated => 0,
context => q||,
},
};
1;

35
lib/WebGUI/i18n/English/PayDriver_ExpressCheckout.pm
View file

@ -95,6 +95,41 @@ our $I18N = {
message => q{Username from Paypal credentials},
lastUpdated => 1247254128,
},
'summary template' => {
message => q|Summary Template|,
lastUpdated => 0,
context => q|Form label in the configuration form of the Cash module.|
},
'summary template help' => {
message => q|Pick a template to display the screen where the user confirms the cart summary info and agrees to pay.|,
lastUpdated => 0,
context => q|Hover help for the summary template field in the configuration form of the Cash module.|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password help' => {
message => q|The password for your ITransact account.|,
lastUpdated => 0,
context => q|Hover help for the password field in the configuration form of the iTransact module.|
},
'Pay' => {
message => q|Pay|,
lastUpdated => 0,
context => q|Button label|
},
'cart summary template' => {
message => q|PayPal Express Checkout Cart Summary Template|,
lastUpdated => 0,
context => q||
},
};
1;

64
lib/WebGUI/i18n/English/PayDriver_ITransact.pm
View file

@ -12,56 +12,6 @@ our $I18N = {
lastUpdated => 0,
context => q|The name of the ITransact plugin|,
},
'label' => {
message => q|Credit Card|,
lastUpdated => 0,
context => q|Default ITransact payment gateway label|
},
'phone' => {
message => q|Telephone Number|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'country' => {
message => q|Country|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'firstName' => {
message => q|First name|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'lastName' => {
message => q|Last name|,
lastUpdated => 0,
context => q|Form label in the checkout form of the iTransact module.|
},
'address' => {
message => q|Address|,
lastUpdated => 1101772170,
context => q|Form label in the checkout form of the iTransact module.|
},
'city' => {
message => q|City|,
lastUpdated => 1101772171,
context => q|Form label in the checkout form of the iTransact module.|
},
'state' => {
message => q|State|,
lastUpdated => 1101772173,
context => q|Form label in the checkout form of the iTransact module.|
},
'zipcode' => {
message => q|Zipcode|,
lastUpdated => 1101772174,
context => q|Form label in the checkout form of the iTransact module.|
},
'email' => {
message => q|Email|,
lastUpdated => 1101772176,
context => q|Form label in the checkout form of the iTransact module.|
},
'cardNumber' => {
message => q|Credit card number|,
lastUpdated => 1101772177,
@ -124,7 +74,7 @@ our $I18N = {
},
'edit credentials template' => {
message => q|Edit Credentials Template|,
message => q|ITransact Edit Credentials Template|,
lastUpdated => 0,
context => q|Title of the help page.|
},
@ -152,18 +102,6 @@ our $I18N = {
context => q|Template variable help.|
},
'addressField help' => {
message => q|A single text field for the user to enter in their street address.|,
lastUpdated => 0,
context => q|Template variable help.|
},
'emailField help' => {
message => q|A single text field for the user to enter in their email address.|,
lastUpdated => 1231192368,
context => q|Template variable help.|
},
'cardNumberField help' => {
message => q|A single text field for the user to enter in their credit card number.|,
lastUpdated => 0,

18
lib/WebGUI/i18n/English/PayDriver_Ogone.pm
View file

@ -80,6 +80,17 @@ our $I18N = {
context => q|Hover help of a setting in the ogone config screen.|,
},
'summary template' => {
message => q|Summary Template|,
lastUpdated => 0,
context => q|Form label in the configuration form of the Cash module.|
},
'summary template help' => {
message => q|Pick a template to display the screen where the user confirms the cart summary info and agrees to pay.|,
lastUpdated => 0,
context => q|Hover help for the summary template field in the configuration form of the Cash module.|
},
'pay' => {
message => q|Pay|,
lastUpdated => 0,
@ -129,6 +140,13 @@ our $I18N = {
lastUpdated => 0,
context => q|Text that describes the required Ogone settings.|,
},
'cart summary template' => {
message => q|Ogone Payment Gateway Summary Template.|,
lastUpdated => 0,
context => q|Status message|,
},
};
1;

35
lib/WebGUI/i18n/English/PayDriver_PayPalStd.pm
View file

@ -204,6 +204,41 @@ Additionally, set the &quot;Return URL&quot; to:|,
lastUpdated => 1245364211,
context => q|An informational message that's shown in the configuration form of this plugin.|
},
'summary template' => {
message => q|Summary Template|,
lastUpdated => 0,
context => q|Form label in the configuration form|
},
'summary template help' => {
message => q|Pick a template to display the screen where the user confirms the cart summary info and agrees to pay.|,
lastUpdated => 0,
context => q|Hover help for the summary template field in the configuration form|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password help' => {
message => q|The password for your ITransact account.|,
lastUpdated => 0,
context => q|Hover help for the password field in the configuration form of the iTransact module.|
},
'Pay' => {
message => q|Pay|,
lastUpdated => 0,
context => q|Button label|
},
'cart summary template' => {
message => q|PayPal Std Payment Driver Plugin Cart Summary Template|,
lastUpdated => 0,
context => q||
},
};
1;

66
lib/WebGUI/i18n/English/Shop.pm
View file

@ -201,12 +201,6 @@ our $I18N = {
context => q|a help description|,
},
'checkoutButton help' => {
message => q|The button the user pushes to choose a payment method.|,
lastUpdated => 0,
context => q|a help description|,
},
'continueShoppingButton help' => {
message => q|Clicking this button will take the user back to the site.|,
lastUpdated => 0,
@ -219,18 +213,6 @@ our $I18N = {
context => q|a help description|,
},
'chooseShippingButton help' => {
message => q|Clicking this button will let the user pick a shipping address from the address book.|,
lastUpdated => 0,
context => q|a help description|,
},
'shipToButton help' => {
message => q|Does the same as the chooseShippingButton.|,
lastUpdated => 0,
context => q|a help description|,
},
'subtotalPrice help' => {
message => q|The price of all the items in the cart.|,
lastUpdated => 0,
@ -976,6 +958,12 @@ our $I18N = {
context => q|a button the user clicks on to set shipping information|
},
'Special shipping' => {
message => q|Special shipping|,
lastUpdated => 0,
context => q|a button the user clicks on to set shipping information on an item|
},
'shipping address' => {
message => q|Shipping Address|,
lastUpdated => 0,
@ -1743,6 +1731,48 @@ our $I18N = {
context => q|commerce setting help|
},
'Billing Address' => {
message => q|Billing Address|,
lastUpdated => 0,
context => q|template label for the cart|
},
'Shipping Address' => {
message => q|Shipping Address|,
lastUpdated => 0,
context => q|template label for the cart|
},
'use same shipping as billing' => {
message => q|Use the same shipping address as billing address.|,
lastUpdated => 0,
context => q|template label for the cart|
},
'Add new address' => {
message => q|Add new address|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to build a new address.|
},
'Update this address' => {
message => q|Update this address|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to build a new address.|
},
'Choose a payment method' => {
message => q|Choose a payment method|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to choose a payment method. Bart Jol for Minister in 2012!|
},
'shippableItemsInCart' => {
message => q|A boolean which will be true if any item in the cart requires shipping.|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to choose a payment method. Bart Jol for Minister in 2012!|
},
};
1;

4
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -4304,7 +4304,7 @@ LongTruncOk=1</p>
},
'Contact Us' => {
message => q{All Contact Us},
message => q{Contact Us},
lastUpdated => 0,
context => q{Template label for automatically created Page layouts during Site Setup.},
},
@ -4316,7 +4316,7 @@ LongTruncOk=1</p>
},
'Forums' => {
message => q{Initial Pages},
message => q{Forums},
lastUpdated => 0,
context => q{Label for the Site Setup screen},
},