lib/Catalyst/Helper/Handel.pm lib/Catalyst/Model/Handel/Cart.pm lib/Catalyst/Model/Handel/Order.pm lib/Handel/Base.pm lib/Handel/Cart/Schema.pm lib/Handel/Compat.pm lib/Handel/Compat/Currency.pm lib/Handel/Components/Constraints.pm lib/Handel/Components/DefaultValues.pm lib/Handel/Components/Validation.pm lib/Handel/Iterator/DBIC.pm lib/Handel/Iterator/List.pm lib/Handel/Iterator/Results.pm lib/Handel/Manual.pod lib/Handel/Manual/About.pod lib/Handel/Manual/Cookbook.pod lib/Handel/Manual/Cookbook/AddingColumns.pod lib/Handel/Manual/Cookbook/WritingCustomStorage.pod lib/Handel/Manual/Intro.pod lib/Handel/Manual/KnownIssues.pod lib/Handel/Manual/QuickStart.pod lib/Handel/Manual/Requirements.pod lib/Handel/Manual/Schema.pod lib/Handel/Manual/Storage.pod lib/Handel/Manual/Storage/DBIC.pod lib/Handel/Manual/Upgrading.pod lib/Handel/Order/Schema.pm lib/Handel/Schema.pm lib/Handel/Schema/DBIC/Cart.pm lib/Handel/Schema/DBIC/Cart/Item.pm lib/Handel/Schema/DBIC/Order.pm lib/Handel/Schema/DBIC/Order/Item.pm lib/Handel/Storage.pm lib/Handel/Storage/DBIC.pm lib/Handel/Storage/DBIC/Cart.pm lib/Handel/Storage/DBIC/Cart/Item.pm lib/Handel/Storage/DBIC/Order.pm lib/Handel/Storage/DBIC/Order/Item.pm lib/Handel/Storage/DBIC/Result.pm lib/Handel/Storage/Result.pm lib/Module/Starter/Handel.pm script/handel.pl t/base_cart_class.t t/base_create_accessors.t t/base_create_instance.t t/base_get_column.t t/base_item_class.t t/base_set_column.t t/base_storage.t t/base_storage_class.t t/base_update.t t/cart_create.t t/cart_item_create.t t/cart_search.t t/catalyst_helpers_handel.t t/catalyst_helpers_scaffold.t t/catalyst_model_cart.t t/catalyst_model_order.t t/compat.t t/compat_cart_item_new.t t/compat_cart_items.t t/compat_cart_load.t t/compat_cart_new.t t/compat_currency.t t/compat_order_item_new.t t/compat_order_items.t t/compat_order_load.t t/compat_order_new.t t/config_modperl1.t t/config_modperl2.t t/constraints_cart_name.t t/exceptions_axkit.t t/htdocs/tt2/constants.tt2 t/htdocs/tt2/out/constants.tt2.out t/iterator.t t/iterator_dbic.t t/iterator_list.t t/iterator_results.t t/l10n_lexicon_synced.t t/lib/Handel/Checkout/Plugin/NotBlessedPlugin.pm t/lib/Handel/Checkout/Plugin/NotISAPlugin.pm t/lib/Handel/Subclassing/Base1.pm t/lib/Handel/Subclassing/Base2.pm t/lib/Handel/Subclassing/Base3.pm t/lib/Handel/Subclassing/Currency.pm t/lib/Handel/Subclassing/GenericItem.pm t/lib/Handel/Subclassing/Storage.pm t/lib/Handel/Test.pm t/lib/Handel/Test/Schema.pm t/lib/Handel/TestComponents/Constraints.pm t/lib/Handel/TestComponents/DefaultValues.pm t/lib/Handel/TestComponents/Validation.pm t/manifest.t t/module_starter.t t/order_create.t t/order_item_create.t t/order_save.t t/order_search.t t/schema.t t/sql/test.sqlite.sql t/storage_add_columns.t t/storage_add_constraint.t t/storage_check_constraints.t t/storage_clone.t t/storage_column_accessors.t t/storage_columns.t t/storage_constraints.t t/storage_copyable_item_columns.t t/storage_currency_class.t t/storage_currency_columns.t t/storage_dbic_add_columns.t t/storage_dbic_add_constraint.t t/storage_dbic_add_item.t t/storage_dbic_clone.t t/storage_dbic_column_accessors.t t/storage_dbic_columns.t t/storage_dbic_connection_info.t t/storage_dbic_constraints.t t/storage_dbic_copyable_item_columns.t t/storage_dbic_count_items.t t/storage_dbic_create.t t/storage_dbic_currency_code.t t/storage_dbic_currency_columns.t t/storage_dbic_currency_format.t t/storage_dbic_default_values.t t/storage_dbic_delete.t t/storage_dbic_delete_items.t t/storage_dbic_has_column.t t/storage_dbic_primary_columns.t t/storage_dbic_process_error.t t/storage_dbic_remove_columns.t t/storage_dbic_remove_constraint.t t/storage_dbic_remove_constraints.t t/storage_dbic_schema_class.t t/storage_dbic_schema_instance.t t/storage_dbic_search.t t/storage_dbic_search_items.t t/storage_dbic_setup.t t/storage_dbic_validation.t t/storage_default_values.t t/storage_has_column.t t/storage_iterator_class.t t/storage_new.t t/storage_primary_columns.t t/storage_remove_columns.t t/storage_remove_constraint.t t/storage_remove_constraints.t t/storage_set_default_values.t t/storage_setup.t t/storage_validate_data.t t/storage_validation.t t/style_critic_core.rc t/style_critic_core.t t/style_no_tabs.t t/tt2_constants.t @@ -1,12 +1,278 @@ Revision history for Perl module Handel +1.00000 Sun June 24 08:57:22 2007 + - constraint_price now uses $currency->value if value isa + Data::Currency object + +0.99_19 Thur June 21 21:02:36 2007 + - Storage->setup now puts non-accessor keys into %$self + - Removed incomplete L10N Lexicons + - Cleanup coverage before 1.0 release + - DBIx::Class 0.08 Released & Required + - Added AutoCommit to Handel::Test + - Tweaked failing checkout process tests + +0.99_18 Wed Apr 18 19:55:09 2007 + - Added --version to handel.pl/handel.bat + - Fixed Handel::Compat::Currency pod + - Updated prereq to use DBIx::Class 0.07999_02 + - Added skips for DBD::SQLite 1.13 (teh devil) causing failing tests + - Updated Perl::Critic tests + +0.99_17 Wed Mar 21 20:11:24 2007 + - Renamed ConfigReaders %Defaults to %DEFAULTS + - Removed t/style_critic_tests. ETOOMUCHWORKFORLITTLEBENEFIT + - Updated Test::MockObject in tests to 1.07 + - Fixed destroy in Order + - Fixed has_column check when setting item currency columns + + BREAKING API CHANGE: + - Handel::Currency isa Data::Currency + - H::C::format moved to as_string; now just returns the format + +0.99_16 Thur Dec 21 16:21:15 2006 + - Added \%options/order_by to search/items in Cart/Order + - Added has_column to DBIC Storage to use ResultSource->has_column + - Added has_column to Result/DBIC Result + - Fixed TT demo code. Maybe that will die some day. + Seriously. Two words: Catalyst Helpers. :-) + - Fixed issue where Compat Currency convert failed with converter returns 0 + - Changed quickstart setup script to *_handel.pl + - Added 0700 perms to handel.pl app script + - Storage::process_error now only dies Handel::Exception subclasses instead + of all blessed objects + - Renamed DBIC schema classes into Schema::DBIC space, like their RDBO + cousins + +0.99_15 Sun Nov 12 17:50:52 2006 + - L10N files now use constant-like keys rather than english errors + - L10N::es_es.pm reworked by Diego Kuperman + - L10N::fr reworked by Pierrick DINTRAT + - Added l10n_lexicon_synced.t to ensure language lexicons are synced with + each other via key checks + - Removed constraint_uuid check from Checkout order/cart since it's not + subclass friendly (RT#19813,TKP) + - Checkout cart now throws an exception of now order can be found matching + the search criteria + - Converted tests to use Handel::Test + - Cleanup tests against Perl::Critic + - Fixed Checkout prototype mismatch warning under perl > 5.8.8 + - Added more config tests for MP1/MP2 + - Added more Schema connect tests + - Added more Base tests + - Added Iterator tests + - Fixed bug in Iterator:::DBIC where first increments the resulset + - Fixed issue in Cat Helpers that treated MyApp::Controller:: as a valid + name + - Added Catalyst Model setup tests + - Added Catalyst Scaffold Helper tests + - Added checkout_class to Order pod + - Added Module::Starter::Handel to help kickstart Handel projects + - Added currency_code_column to storage so DBIC inflators can set currency + code using another column in the row + - Removed formatting options from Currency->convert now that it always + returns a currency object instead of formatted strings + - Reworked Handel::Currency to be more object like with its parameters + - Added Handel::Compat::Currency, inserted automatically when loading + Handel::Compat + - Added compat_currency.t tests + - Converted to Module::Pluggable::Object + - Cart restore now throws exception on unknown mode like it was supposed to + - Only create currency converter when calling convert for the first time + - Added handel.pl quickstart scripts for Module::Starter::Handel apps + - Added Catalyst::Helper::Handel to create entire cat app w/ starter + subclasses + - Huge test coverage. 99% w00t! + - Mostly Perl::Critic happy...except for some test labels + - Probably last release before 1.0! + +0.99_14 Sat Sep 23 19:14:22 2006 + - Added Order::save method + - MarkOrderSaved plugin now uses Order::save method instead of setting + the type field directly + - Removed constraint_uuid check from Order create/reconcile as it's not + subclass of interchangable schema friendly (RT#19813,TKP) + - Changed id references in search to use first primary key from Storage + (RT#19813,TKP) + - Order creation from cart no does can('shopper') to help w/ subclassing + +0.99_13 Wed Sep 20 19:01:29 2006 + - Added NEXT to prereqs for Handel::Compat + - Moved FormValidator::Simple from recommended to prereqs + - Added set_default_values to Storage + - Added check_constraints to Storage + - Added validate_data to Storage + +0.99_12 Fri Sep 15 22:28:53 2006 + - Moved Locale::Currency/Format and WebServiceX modules to requirements + - Currency new() now takes $code and $format params + - Added name/code to Currency + - Added converter_class to Currency + - Added currency_code and currency_format to Storage + - Storage::DBIC now passes currency_code/format into DBIC inflate subs for + currency_columns + - Added Storage::DBIC currency_code/currency_format tests + - Finished Perl::Critic cleanup + +0.99_11 Sun Sep 10 13:33:22 2006 + - Fix examples code in AddingColumns.pod + - Fixed pod references after DBIC Storage rearrangement + - Added item_storage_class/item_storage to Storage so item related methods + could get item storage config from item storage without being tied to + top level item class + - Moved item_class/cart_class back into Handel::Base. They don't belong in + storage + - Moved checkout_class back into Handel::Order. That doesn't belong in + storage either + - Added WritingCustomStorage to Cookbook + - Added has_column to Storage + +0.99_10 Wed Sep 06 21:02:33 2006 + - Added start of Cookbook and Cookbook/AddColumns + - Moved DBIC specific Storage classes into DBIC namespace + - Changed process to get items->all instead of (items) + +0.99_09 Tue Sep 05 19:18:52 2006 + - Catalyst Helpers now require FormValidator::Simple 0.17 (Woohoo!) + - Validation component now requires DBIx::Class::Validation 0.01001 + which uses new FV::S for profile/instance/messages fixes + - Filled in pod generated by Catalyst Helpers in a moment of weakness + +0.99_08 Mon Sep 04 16:45:22 2006 + - Added txn_begin/commit/rollback to Storage and Storage::DBIC to help + abstract Checkout::process from Storage. + - Added Storage::DBIC::Result to get DBIC specific things out of + Storage::Result + - Minor pod fixes + +0.99_07 Sun Sep 03 20:58:13 2006 + WARNING: The auto generated Catalyst helper code requires + FormValidator::Simple + changes/fixes that have yet to be commited or accepted until the author + responds. + Contact me if you need a copy of the modified version. + + - Moved perl_critic.t to style_perl_critic.t + - Added style_no_tabs.t + - Style tests now enabled via TEST_PRIVATE + - Reworked Catalyst Helpers for Controllers and their tests. + - Fixed issue where add_handler wasn't assigning unique pref ids when non + were specified in the plugins themselves. + - Moved requirements to Requirements.pod + - Cart destroy now works on a blessed object under Catalyst + - AssignOrderNumber checkout plugin no longer sets the updated field. + This will be rolled into the Order class in the next release. + +0.99_06 Fri Aug 25 20:53:26 2006 + - Simplified Storage->setup and removed clear/reset nonsense + - Added Spanish lexion provided by Diego Kuperman + - Abstracted Iterator and added subclasses for lists, DBIC resultsets + and storage results + - Added result_iterator_class to Base using default of + Handel::Iterator::Results + - Storage now leaves DBIC result_class alone and returns + Handel::Iterator::DBIC + iterators for search/search_items + - Cart/Order now use Handel::Iterator::Results iterator + - Split DBIC specific storage into Storage::DBIC w/ massive tests + - Started moving news tests to Handel::Test w/ better db deploy/var + directory + - Split Manual Storage into Storage/Storage::DBIC + - Added param checks to many Storage methods + - Replaced old Makefile warnings w/ mention of Test::More and DateTime + compares + - Added Perl::Critic tests for my personal gratification. None pass yet. :-) + - currency_columns gets/sets list instead of arrayrefs to better match + generic + columns/primary_columns + - Bumped DBIC requirement to 0.08 (use -current for now) + - Reworked Catalyst Helpers for Models (Controllers are still broken) + +0.99_05 Wed Aug 09 21::02::29 2006 + - Changed create_result in Base to create_instance + - Added create/search/uuid_maker/copyable_item_columns to Storage + - Storage->clone now clones even with an active schema instance + - Schema configuration in Storage now uses a clone of the item_classes + storage instead of the original, and redirects result->storage + - Cart/Order/Items now use storage create/search + - Cart/Order add() now use copyable_item_columns when passed objects + - Cart/Order add() now look for source columns and methods to fill + destination column values + - Various pod fixes + - Added more tests for create_instance/clone changes + - Cart/Order/Item new/load/destroy now take \%options, specifically + $options{storage} + - Order->new $process argument moved into \%options + - Order->copy_cart_items now just uses add + - Added checkout_class to Storage + - Storage now uses exception_action rather than dbh->{HandleError} + - Storage process_error now creates a Storage Exception for unknown errors + - Moved storage settings in Cart/Order Item into Storage::Cart/Order::Item - Applied Catalyst Helper test patch from Todd W. - -0.33 Mon Jun 19 19:31:23 2006 + - Added Storage::Result, which is now returned by storage actions + - Handel::Currency convert now returns a new currency object + - Cart/Order/Item now use generic result objects + - Cart/Order clear now returns result of action like delete does + - Renamed Cart/Order/Item new() to create() + - Renamed Cart/Order/Item load() to search() + - Added load/new/items to Compat.t w/subclass tests + +0.99_04 Sat Jul 15 16:21:25 2006 + - Schema configuration now finally uses load_components without the + Class::C3 recalc slowdown + - Validation component now uses throw_exception/next::method now that + load_components is used + - Major pod cleanup + - Excised all forms of RETURN_AS + - TEST_SPELLING is now TEST_POD, which all pod tests now use + - Order created/updated fields now return DateTime objects using + DBIx::Class::InflateColumn::DateTime + - Excised remaining UNIVERSAL::isa mistakes. Blessed is your friend. + - Order created/updated fields now default to DateTime->now + +0.99_03 Mon Jul 10 21:05:27 2006 + - Fixed AxKit Exception Error (RT#19707,TKP) + - Added start of Handel::Manual + - uuid is now new_uuid, and now in Storage + - Removed setup_columns_accessors in favor or create_accessors in Base + - Cart/Order/Item classes now have a instance of storage instead of + subclassing it + - Added Handel::Base as super class for Cart/Order/Item classes + - Added Handel::Storage tests + - Handel::Storage now does all schema configurate during first + schema_instance call + - Added Handel::Storage::new/setup + - Cart/Order/Item classes now delegate direct schema access to Storage + - Added validation/constraint/default_value_class to Storage + - Converted Storage from Class::Data::Accessor to Class::Accesssor::Grouped + - Refactored injection of components into schema source classes + - schema_instance now creates a clone using compose_namespace and + does its component injection into the clone instead + - Added currency_class/currency_columns to Storage + - Added value() to Handel::Currency + - Added autoupdate to results that inherits from storage->autoupdate + - Added basic compatibility layer for older subclasses + +0.99_02 Mon Jun 05 22:08:32 2006 + - Fixed test counts in t/order_new.t (RT#19700,TKP) + - Moved _error_handler in Storage to process_error and set + dbh->{HandelError} using $self->can + - Use blessed when setting schema_instance in Storage + - Abstracted schema setup when setting Storage->schema_instance($schema) + +0.99_01 + - RETURN_AS has been removed from the API + - Data filters now take SQL::Abstract syntax for wildcards + - Converted from Class::DBI to DBIx::Class schemas + - Handel::ConfigReader is now a singleton via instance() + - Handel::DBI is deprecated in favor if Handel::Storage + - Moved column defaults into Handel::Components::DefaultValues + - Added constraint_cart_name + +0.33 - Fixed version requirement for catalyst tests - Fixed cart iterator tests db file creation issues - Cart taglib now calls tag-based functions to ease subclassing - - Applied Catalyst Controller Helper patch from Todd W. for Catalyst 5.6+ 0.32 Sun Jan 22 18:19:38 2006 - Added order_reconcile.t tests @@ -412,3 +678,6 @@ Revision history for Perl module Handel + + + Changes @@ -22,34 +22,73 @@ demo/tt2/style/css/basic.css lib/AxKit/XSP/Handel/Cart.pm lib/AxKit/XSP/Handel/Checkout.pm lib/AxKit/XSP/Handel/Order.pm +lib/Catalyst/Helper/Handel.pm lib/Catalyst/Helper/Handel/Scaffold.pm lib/Catalyst/Helper/Controller/Handel/Cart.pm lib/Catalyst/Helper/Controller/Handel/Checkout.pm lib/Catalyst/Helper/Controller/Handel/Order.pm lib/Catalyst/Helper/Model/Handel/Cart.pm lib/Catalyst/Helper/Model/Handel/Order.pm +lib/Catalyst/Model/Handel/Cart.pm +lib/Catalyst/Model/Handel/Order.pm lib/Handel.pm +lib/Handel/Base.pm +lib/Handel/Compat.pm +lib/Handel/Compat/Currency.pm lib/Handel/Cart.pm lib/Handel/Cart/Item.pm +lib/Handel/Cart/Schema.pm lib/Handel/Checkout.pm lib/Handel/Checkout/Message.pm lib/Handel/Checkout/Plugin.pm lib/Handel/Checkout/Plugin/AssignOrderNumber.pm lib/Handel/Checkout/Plugin/MarkOrderSaved.pm lib/Handel/Checkout/Stash.pm +lib/Handel/Components/Constraints.pm +lib/Handel/Components/DefaultValues.pm +lib/Handel/Components/Validation.pm lib/Handel/ConfigReader.pm lib/Handel/Constants.pm lib/Handel/Constraints.pm lib/Handel/Currency.pm -lib/Handel/DBI.pm lib/Handel/Exception.pm lib/Handel/Iterator.pm +lib/Handel/Iterator/DBIC.pm +lib/Handel/Iterator/List.pm +lib/Handel/Iterator/Results.pm lib/Handel/L10N.pm lib/Handel/L10N/en_us.pm lib/Handel/L10N/fr.pm -lib/Handel/L10N/zh_tw.pm +lib/Handel/Manual.pod +lib/Handel/Manual/About.pod +lib/Handel/Manual/Cookbook.pod +lib/Handel/Manual/Cookbook/AddingColumns.pod +lib/Handel/Manual/Cookbook/WritingCustomStorage.pod +lib/Handel/Manual/Intro.pod +lib/Handel/Manual/KnownIssues.pod +lib/Handel/Manual/QuickStart.pod +lib/Handel/Manual/Schema.pod +lib/Handel/Manual/Storage.pod +lib/Handel/Manual/Storage/DBIC.pod +lib/Handel/Manual/Requirements.pod +lib/Handel/Manual/Upgrading.pod lib/Handel/Order.pm lib/Handel/Order/Item.pm +lib/Handel/Order/Schema.pm +lib/Handel/Schema.pm +lib/Handel/Schema/DBIC/Cart.pm +lib/Handel/Schema/DBIC/Cart/Item.pm +lib/Handel/Schema/DBIC/Order.pm +lib/Handel/Schema/DBIC/Order/Item.pm +lib/Handel/Storage.pm +lib/Handel/Storage/Result.pm +lib/Handel/Storage/DBIC.pm +lib/Handel/Storage/DBIC/Cart.pm +lib/Handel/Storage/DBIC/Cart/Item.pm +lib/Handel/Storage/DBIC/Order.pm +lib/Handel/Storage/DBIC/Order/Item.pm +lib/Handel/Storage/DBIC/Result.pm +lib/Module/Starter/Handel.pm lib/Template/Plugin/Handel/Cart.pm lib/Template/Plugin/Handel/Checkout.pm lib/Template/Plugin/Handel/Constants.pm @@ -60,17 +99,27 @@ MANIFEST MANIFEST.SKIP META.yml README +script/handel.pl sql/handel.sqlite.sql +t/base_storage.t +t/base_storage_class.t +t/base_update.t +t/base_create_accessors.t +t/base_create_instance.t +t/base_cart_class.t +t/base_item_class.t +t/base_get_column.t +t/base_set_column.t t/basic.t t/cart_add.t t/cart_clear.t t/cart_delete.t t/cart_destroy.t -t/cart_item_new.t +t/cart_item_create.t t/cart_items.t t/cart_iterator.t -t/cart_load.t -t/cart_new.t +t/cart_search.t +t/cart_create.t t/cart_restore.t t/cart_restore_append.t t/cart_restore_append_filter.t @@ -79,11 +128,15 @@ t/cart_restore_merge_filter.t t/cart_restore_replace.t t/cart_restore_replace_filter.t t/cart_save.t +t/catalyst_helpers_handel.t +t/catalyst_helpers_scaffold.t t/catalyst_helpers_controller_cart.t t/catalyst_helpers_controller_checkout.t t/catalyst_helpers_controller_order.t t/catalyst_helpers_model_cart.t t/catalyst_helpers_model_order.t +t/catalyst_model_cart.t +t/catalyst_model_order.t t/checkout_cart.t t/checkout_messages.t t/checkout_order.t @@ -93,7 +146,10 @@ t/checkout_process.t t/checkout_stash.t t/conf/extra.conf.in t/config.t +t/config_modperl1.t +t/config_modperl2.t t/constants.t +t/constraints_cart_name.t t/constraints_cart_type.t t/constraints_checkout_phase.t t/constraints_currency_code.t @@ -102,8 +158,18 @@ t/constraints_price.t t/constraints_quantity.t t/constraints_uuid.t t/currency.t -t/dbi.t +t/compat.t +t/compat_cart_load.t +t/compat_cart_items.t +t/compat_cart_new.t +t/compat_cart_item_new.t +t/compat_order_load.t +t/compat_order_items.t +t/compat_order_new.t +t/compat_order_item_new.t +t/compat_currency.t t/exceptions.t +t/exceptions_axkit.t t/htdocs/axkit/cart_cart.xsp t/htdocs/axkit/cart_cart_add.xsp t/htdocs/axkit/cart_cart_add_filtered.xsp @@ -322,6 +388,7 @@ t/htdocs/tt2/cart_restore_replace.tt2 t/htdocs/tt2/cart_save.tt2 t/htdocs/tt2/cart_update.tt2 t/htdocs/tt2/cart_uuid.tt2 +t/htdocs/tt2/constants.tt2 t/htdocs/tt2/checkout_messages.tt2 t/htdocs/tt2/checkout_order.tt2 t/htdocs/tt2/checkout_phases.tt2 @@ -367,6 +434,7 @@ t/htdocs/tt2/out/cart_restore_merge.tt2.out t/htdocs/tt2/out/cart_restore_replace.tt2.out t/htdocs/tt2/out/cart_save.tt2.out t/htdocs/tt2/out/cart_update.tt2.out +t/htdocs/tt2/out/constants.tt2.out t/htdocs/tt2/out/checkout_messages.tt2.out t/htdocs/tt2/out/checkout_order.tt2.out t/htdocs/tt2/out/checkout_phases.tt2.out @@ -390,9 +458,16 @@ t/htdocs/tt2/out/order_items_filtered.tt2.out t/htdocs/tt2/out/order_items_filtered_no_results.tt2.out t/htdocs/tt2/out/order_items_update.tt2.out t/htdocs/tt2/out/order_update.tt2.out +t/iterator.t +t/iterator_list.t +t/iterator_dbic.t +t/iterator_results.t t/l10n.t +t/l10n_lexicon_synced.t t/lib/Handel/Checkout/Plugin/TestPlugin.pm t/lib/Handel/Checkout/Plugin/TestBogusPlugin.pm +t/lib/Handel/Checkout/Plugin/NotBlessedPlugin.pm +t/lib/Handel/Checkout/Plugin/NotISAPlugin.pm t/lib/Handel/Checkout/TestMessage.pm t/lib/Handel/OtherTestPlugins/Second.pm t/lib/Handel/Subclassing/Cart.pm @@ -400,42 +475,113 @@ t/lib/Handel/Subclassing/CartOnly.pm t/lib/Handel/Subclassing/CartItem.pm t/lib/Handel/Subclassing/Checkout.pm t/lib/Handel/Subclassing/CheckoutStash.pm +t/lib/Handel/Subclassing/Currency.pm +t/lib/Handel/Subclassing/GenericItem.pm t/lib/Handel/Subclassing/Order.pm t/lib/Handel/Subclassing/OrderOnly.pm t/lib/Handel/Subclassing/OrderItem.pm t/lib/Handel/Subclassing/OrderCart.pm t/lib/Handel/Subclassing/OrdersCart.pm t/lib/Handel/Subclassing/Stash.pm +t/lib/Handel/Subclassing/Base1.pm +t/lib/Handel/Subclassing/Base2.pm +t/lib/Handel/Subclassing/Base3.pm +t/lib/Handel/Subclassing/Storage.pm +t/lib/Handel/Test.pm +t/lib/Handel/Test/Schema.pm +t/lib/Handel/TestComponents/Constraints.pm +t/lib/Handel/TestComponents/DefaultValues.pm +t/lib/Handel/TestComponents/Validation.pm t/lib/Handel/TestHelper.pm t/lib/Handel/TestPipeline/InitializeTotals.pm t/lib/Handel/TestPipeline/ValidateError.pm t/lib/Handel/TestPipeline/ReadFromStash.pm t/lib/Handel/TestPipeline/WriteToStash.pm t/lib/Handel/TestPlugins/First.pm +t/manifest.t +t/module_starter.t t/order_add.t t/order_clear.t t/order_delete.t t/order_destroy.t -t/order_item_new.t +t/order_save.t +t/order_item_create.t t/order_items.t -t/order_load.t -t/order_new.t +t/order_search.t +t/order_create.t t/order_reconcile.t t/pod_coverage.t t/pod_spelling.t t/pod_syntax.t +t/schema.t +t/style_critic_core.rc +t/style_critic_core.t +t/style_no_tabs.t t/strict.t t/SMOKE.PL +t/storage_columns.t +t/storage_copyable_item_columns.t +t/storage_primary_columns.t +t/storage_add_columns.t +t/storage_new.t +t/storage_remove_columns.t +t/storage_add_constraint.t +t/storage_remove_constraint.t +t/storage_check_constraints.t +t/storage_validate_data.t +t/storage_set_default_values.t +t/storage_setup.t +t/storage_constraints.t +t/storage_default_values.t +t/storage_validation.t +t/storage_iterator_class.t +t/storage_currency_class.t +t/storage_currency_columns.t +t/storage_has_column.t +t/storage_remove_constraints.t +t/storage_column_accessors.t +t/storage_clone.t +t/storage_dbic_has_column.t +t/storage_dbic_schema_class.t +t/storage_dbic_connection_info.t +t/storage_dbic_add_columns.t +t/storage_dbic_add_constraint.t +t/storage_dbic_add_item.t +t/storage_dbic_clone.t +t/storage_dbic_column_accessors.t +t/storage_dbic_columns.t +t/storage_dbic_copyable_item_columns.t +t/storage_dbic_count_items.t +t/storage_dbic_primary_columns.t +t/storage_dbic_remove_columns.t +t/storage_dbic_constraints.t +t/storage_dbic_create.t +t/storage_dbic_currency_columns.t +t/storage_dbic_currency_code.t +t/storage_dbic_currency_format.t +t/storage_dbic_default_values.t +t/storage_dbic_delete.t +t/storage_dbic_delete_items.t +t/storage_dbic_process_error.t +t/storage_dbic_remove_constraint.t +t/storage_dbic_remove_constraints.t +t/storage_dbic_schema_instance.t +t/storage_dbic_search.t +t/storage_dbic_search_items.t +t/storage_dbic_setup.t +t/storage_dbic_validation.t t/sql/cart_create_table.sql t/sql/cart_delete_data.sql t/sql/cart_fake_data.sql t/sql/order_create_table.sql t/sql/order_delete_data.sql t/sql/order_fake_data.sql +t/sql/test.sqlite.sql t/subclassing.t t/TEST.PL t/tt2_cart.t t/tt2_checkout.t +t/tt2_constants.t t/tt2_order.t t/warnings.t t/xsp_cart.t MANIFEST @@ -2,6 +2,7 @@ \bCVS\b ,v$ \B\.svn\b +\B\.tws\b ^blib/ ^pm_to_blib ^MakeMaker-\d MANIFEST.SKIP @@ -1,39 +1,64 @@ --- #YAML:1.0 name: Handel -abstract: Simple commerce framework with AxKit/TT/Catalyst support +abstract: A cart/order/checkout framework with AxKit/TT/Catalyst support author: Christopher H. Laco <claco@chrislaco.com> -version: 0.33 +version: 1.00000 version_from: lib/Handel.pm installdirs: site license: perl requires: - Class::DBI: 0.96 - Class::Data::Inheritable: 0 - DBI: 1.36 + DBIx::Class: 0.08000 + DBIx::Class::UUIDColumns: 0.01 + DBIx::Class::Validation: 0.01001 + Data::Currency: 0.03 + Class::Accessor::Grouped: 0.03 + Class::ISA: 0 + Class::Inspector: 0 + Clone: 0 Error: 0.14 Locale::Maketext: 1.06 - Module::Pluggable: 2.95 - version: 0 + Module::Pluggable: 3.1 + Scalar::Util: 0 + Tie::Hash: 0 + DateTime: 0 + DateTime::Format::MySQL: 0 + Locale::Currency::Format: 1.22 + Locale::Currency: 2.07 + Finance::Currency::Convert::WebserviceX: 0.03 + FormValidator::Simple: 0.17 + NEXT: 0 + FileHandle: 0, + File::Spec::Functions: 0 + File::Path: 0 + Module::Starter: 1.42 + SQL::Translator: 0.08 + Getopt::Long: 0 + Pod::Usage: 0 + DBD::SQLite: 0 build_requires: - Test::More: 0.48 + Test::More: 0.61 recommends: AxKit: 1.61 - Catalyst: 5.5 - Class::DBI: 3.0.12 - Data::FormValidator: 4.00 + Catalyst::Runtime: 5.7001 + Catalyst::Devel: 1.0 HTML::FillInForm: 1.04 - Finance-Currency-Convert-WebserviceX: 0.03 - Locale::Currency::Format: 1.22 - Locale::Currency: 2.07 Pod::Coverage: 0.14 Template: 2.14 + YAML: 0.58 Test::Pod: 1.00 Test::Pod::Coverage: 1.04 Test:Strict: 0.05 Test::Spelling: 0.10 + Test::NoTabs: 0.01 + Test::Perl::Critic: 0.07 + Test::CheckManifest: 0.07 + Test::MockObject: 1.07 no_index: directory: - demo - sql distribution_type: module generated_by: ExtUtils::MakeMaker version 6.17 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.2.html + version: 1.2 META.yml @@ -1,47 +1,31 @@ # $Id$ use ExtUtils::MakeMaker; -use 5.006; +use 5.008001; use strict; use warnings FATAL => 'all'; require Test::More; -if (Test::More->VERSION < 0.48) { +if (Test::More->VERSION < 0.60) { print "\a\a\a\a\a"; print "----------------------------------------------------------\n"; - print "Test::More < 0.48 sometimes causes test failures with\n"; - print "Class::DBI/IMA::DBI. Please consider updating Test::More\n"; - print "to version 0.48 or greater if you experience test failures\n"; - print "with 'attempt to free unreferenced scalar' errors.\n"; + print "Test::More < 0.61 sometimes causes test failures with\n"; + print "when comparing strigified DateTime objects.\n"; + print "Please consider updating Test::More to version 0.61\n"; + print "or greater if you experience test failures.\n"; print "----------------------------------------------------------\n"; sleep 5; }; -eval 'require Handel'; -if (!$@ && Handel->VERSION eq '0.17') { - print "\a\a\a\a\a"; - print "----------------------------------------------------------\n"; - print "BREAKING API CHANGES!!!!\n\n"; - print "Handel::Order >= 0.18 is incompatable with Handel::Order\n"; - print "version 0.17 only. Earlier versions of Handel without\n"; - print "Handel::Order are not effected.\n"; - print "----------------------------------------------------------\n"; - sleep 5; -}; - -my %modules; - -if ($^O eq 'MSWin32') { - eval 'use UUID 0.02;'; - eval 'use Win32::Guidgen 0.02;' if $@; - eval 'use Win32API::GUID 0.02;' if $@; - - %modules = ('UUID' => 0.02) if $@; -} else { - %modules = ('Data::UUID' => 0.10); -}; -if ($^O ne 'openbsd' && eval {require APR::UUID}) { - %modules = (); -}; +#eval 'require Handel'; +#if (!$@ && $Handel::VERSION <= '1.00') { +# print "\a\a\a\a\a"; +# print "----------------------------------------------------------\n"; +# print "BREAKING API CHANGES!!!!\n\n"; +# print "Handel 1.0+ is not API compatable with Handel <= 0.32.\n"; +# print "Please read the documentation for further details.\n"; +# print "----------------------------------------------------------\n"; +# sleep 5; +#}; if ($ENV{TEST_HTTP}) { eval 'use Apache::Test 1.27'; @@ -75,44 +59,59 @@ if ($ENV{TEST_HTTP}) { my @clean = qw( smoke-report-* - t/cart*.db - t/order*.db - t/checkout*.db - t/subclassing.db t/TEST t/SMOKE t/logs - t/htdocs/*.db - t/TestApp t/conf/apache_test_config.pm t/conf/extra.conf t/conf/httpd.conf t/conf/modperl_inc.pl t/conf/modperl_startup.pl t/htdocs/index.html + t/var ); WriteMakefile( NAME => 'Handel', VERSION_FROM => 'lib/Handel.pm', AUTHOR => 'Christopher H. Laco <claco@chrislaco.com>', - ABSTRACT => 'Simple ecommerce framework with AxKit support', + ABSTRACT => 'A cart/order/checkout framework with AxKit/TT/Catalyst support', PREREQ_PM => { - 'Class::DBI' => '0.96', - 'Class::Data::Inheritable' => '0', - 'DBI' => '1.36', - 'Error' => '0.14', - 'Locale::Maketext' => '1.06', - 'Module::Pluggable' => '2.95', - 'version' => '0', - %modules + 'DBIx::Class' => '0.08000', + 'DBIx::Class::UUIDColumns' => '0.01', + 'DBIx::Class::Validation' => '0.01001', + 'Data::Currency' => '0.03', + 'Class::Accessor::Grouped' => '0.03', + 'Class::ISA' => '0', + 'Class::Inspector' => '0', + 'Clone' => '0', + 'Error' => '0.14', + 'Locale::Maketext' => '1.06', + 'Module::Pluggable' => '3.1', + 'Module::Starter' => '1.42', + 'Scalar::Util' => '0', + 'Tie::Hash' => '0', + 'DateTime' => '0', + 'DateTime::Format::MySQL' => '0', + 'Locale::Currency' => '2.07', + 'Locale::Currency::Format' => '1.22', + 'FormValidator::Simple' => '0.17', + 'Finance::Currency::Convert::WebserviceX' => '0.03', + 'NEXT' => '0', + 'FileHandle' => '0', + 'File::Spec::Functions' => '0', + 'File::Path' => '0', + 'SQL::Translator' => '0.08', + 'Getopt::Long' => '0', + 'Pod::Usage' => '0', + 'DBD::SQLite' => '0', }, - (ExtUtils::MakeMaker->VERSION >= 6.11) ? - (NO_META => 1) : (), - + EXE_FILES => [ + 'script/handel.pl' + ], + NO_META => 1, dist => { PREOP => 'pod2text lib/Handel.pm > $(DISTVNAME)/README', }, - clean => { FILES => join ' ', @clean }, - test => { TESTS => join ' ', (glob("t/*.t"))} + clean => { FILES => join ' ', @clean } ); Makefile.PL @@ -1,181 +1,35 @@ NAME - Handel - Simple commerce framework with AxKit/TT/Catalyst support + Handel - A cart/order/checkout framework with AxKit/TT/Catalyst support -DESCRIPTION - Handel is a quick and not-so-dirty ecommerce framework with AxKit taglib - support and TT2 (Template Toolkit) support. It was started for the - conversion of an IIS/ASP based commerce site to Apache/ModPerl, but I - decided that is might be useful to others so here it is on CPAN. - - For the curious, Handel is German for commerce. - -WEBSITE - You can get the latest news, source, documentation and wiki help at - http://handelframework.com/. - -MAILING LIST - Join the mailing list at - http://lists.rawmode.org/cgi-bin/mailman/listinfo/handel. Big thanks to - gabb@#catalyst for the list space. - -GOALS - Database agnostic. Thanks to Class::DBI and staying away from auto - incrementing ids, Handel should run in any database that Class::DBI - supports. - Implementation agnostic. Handel should be able to be used from the - command line, from a web page, from a SOAP service, or from a GUI - application. It's simply a data access mechanism. Any interaction with - forms, web pages, browser, cookies, etc is the responsibility of the - consumer - Checkout agnostic. A checkout process means different things to - different people in different situations. The Handel checkout pipeline - by itself does absolutely nothing with an order. It is instead a plugin - manager that allows you to specify and build plugins to do various - actions (payment authorization, address validation, fax delivery, etc). - Each site, server, page, even process() call can have it's own unique - order processing pipeline. - Easy integration into AxKit using taglibs. - Easy integration into TT2 using plugins. - Easy integration into Catalyst using plugins. - Easy integration into other systems using SOAP. - Feature complete demo site in AxKit. - Feature complete demo site in TT2. - Feature complete demo site in Catalyst. - Public Subversion repository. - Public Wiki/Docs site. - Get someone to actually use the damn thing. :-) - Abstract schema into SQL::Translator scripts - -WHAT HANDEL IS - Simple cart and order record maintenance. - Plugin based checkout pipeline processing framework. - -WHAT HANDEL ISN'T - Intershop, Cart32, WebGUI, CMS, complete web commerce package(1). Handel - is a simple framework to load/upload cart/order data and shove that data - through a plugin based pipeline. - (1) While it is not a complete web based commerce system, I do plan on - having feature complete working demos sites so people can still - quick-start their own projects. - -FEATURES - Add/Update/Delete/Save/Restore Cart Contents - Full AxKit XSP Taglib Support - Template Toolkit 2 Plugin Support - Currency Conversion - Currency Formatting - Basic Localization Support - Multiple Database Support - -REQUIREMENTS - Prerequisites - The following modules are required for Handel to work properly. Older - versions may work fine, but these are the versions I have installed and - verified to work correctly. If you have older versions and all tests - pass, send me an email and I'll lower the version requirements. - - Class::DBI - "Class::DBI" version 0.96 or greater. - - DBI "DBI" version 1.36 or greater. - - Error - "Error" version 0.14 or greater. - - Locale::Maketext - "Locale::Maketext" version 1.06 or greater. - - Data::UUID - At least one of the following modules are required to create uuids: - "UUID" 0.02, "Win32::Guidgen" 0.04, "Win32API::GUID" 0.02, or - "Data::UUID" 0.10. - - Optional Modules - The following modules are not required for Handel to run, although some - features may be unavailable without them. - - AxKit - "AxKit" version 1.61 or greater. - - "AxKit" is only required if you plan on using "Handel" within XSP - using the supplied taglibs. +SYNOPSIS + use Handel; + Handel->config_class('My::ConfigReader'); + + my $config = Handel->config; + # $config->isa('My::ConfigReader') - Locale::Currency::Format - "Locale::Currency::Format" version 1.22 or greater. - - When present, this module allows all prices to be formatted to - specific currency codes and formats. - - Finance::Currency::Convert::WebserviceX - "Finance::Currency::Convert::WebserviceX" version 0.03 or greater. - - When present, this module allows all prices to be converted from one - currency to another. - - Locale::Currency - "Locale::Currency" version 2.07 or greater. - - When present, this module allows all conversion and currency codes - to be verified as real 3 letter ISO currency codes. - - Template - "Template" version 2.07 or greater. - - "Template" (TT2/Template ToolKit) is only required if you plan on - using Handel within TT2 based websites. - - Build/Test Modules - The following modules are only required for the test suite when running - "make test". - - Test::More - "Test::More" version 0.48 or greater. - - The "Test::More" included with perl 5.8.4 and "Test::More" <= 0.48 - have issues with ithreads that usually cause crashes in tests that - use "Class::DBI" or "DBIx:ContextualFetch". The errors usual mention - "attempt to free unreferenced scalar". If you receive these during - "make test", try upgrading "Test::More". - - Pod::Coverage - "Pod::Coverage" version 0.14 or greater. - - The pod coverage tests may fail complaining about missing pod for - methods if Pod::Coverage < 0.14 is installed. This is due to certain - syntax variations of the pod with escaped gt/lt. I may just alter - the pod and bump this version down if there is enough feedback to do - so. - - Test::Pod - "Test::Pod" version 1.00 or greater. - - "Test::Pod" 1.00 added the "all_pod_files_ok()" method which makes - my life easier. :-) - - Test::Pod::Coverage - "Test::Pod::Coverage" version 1.04 or greater. +DESCRIPTION + This is a generic class containing the default configuration used by + other Handel classes. - "Test::Pod::Coverage" 1.04 was made taint safe, and we run the tests - with -wT like good girls and boys. + To learn more about what Handel is and how it works, take a look at the + manual. - Test:Strict - "Test::Strict" version 0.01 or greater. +METHODS + config_class + Arguments: $config_class - This keeps me honest and makes sure I always "use strict". + Gets/sets the name of the configuration class to use. The default + configuration class is Handel::ConfigReader. -CAVEATS - When using item_class to specify the item class returned from add/items - in your subclass under Class::DBI < 3.0.8, the item_class specified will - be returned from all cart classes, including Handel::Cart itself. In - most cases, people are only using one subclass of Handel::Cart so this - won't effect them. + A Handel::Exception exception will be thrown if the specified class can + not be loaded. - If you plan on using multiple subclasses of Handel::Cart that may or may - not return custom items, upgrade your Class::DBI to version 3.0.8 or - greater. + config + Returns an instance of the specified configuration class. SEE ALSO - Handel::Cart + Handel::Cart, Handel::Order, Handel::Checkout AUTHOR Christopher H. Laco README @@ -1,12 +1,13 @@ TODO list for Perl module Handel (in no particular order): - - create sql from SQL::Translator schema scripts + - Handel::Checkout new/add_handler needs opto/memoization + - Handel::Order needs to set updated field automagically + - Update create_accessors to take an accessor_map/ro/wo/rw + - AxKit Tablibs need reworked for subclassing + - TT plugins need reworked for subclassing - add taglib test to check for bogus filter names - - add sql schema and conversions using SQL::Translator - enhance demo sites to use full feature set - slim taglib code to remove repeated code blocks left for clarity - find translation volunteer other than Google translate - clean up cart test variable names - add additional cart restore w/filter tests for multiple saved carts - - devise method for overriding constraints - - abstract DBI layer to use Class::DBI, DBIx::CDBICompat, or DBIx::Class Todo @@ -19,3 +19,6 @@ in your existing httpd.conf file like so: Don't forget to change DocumentRoot, ErrorLog, db_name and 'use lib' to match your system configuration and the installation of Handel. + +NOTE: This is for demo purposes only. THe preferred way to use Handel in a +web application is using Catalyst. demo/tt2/README @@ -11,13 +11,13 @@ [% CGI.header('-cookie', cookie) %] [% END %] - [% UNLESS Handel.Cart.fetch({shopper => shopper, type => 0}) %] + [% UNLESS Handel.Cart.search({shopper => shopper, type => 0}).count %] [% UNLESS Handel.Cart.create({shopper => shopper}) %] <p class="error">Could not create new shopping cart.</p> [% END %] [% END %] - [% FOREACH cart IN Handel.Cart.fetch({shopper => shopper, type => 0}) %] + [% FOREACH cart IN Handel.Cart.search({shopper => shopper, type => 0}).first %] [% IF CGI.param('action') == 'add' %] [% CALL cart.add( sku=CGI.param('sku'), @@ -28,7 +28,7 @@ [% ELSIF CGI.param('action') == 'delete' %] [% CALL cart.delete(id=CGI.param('id')) %] [% ELSIF CGI.param('action') == 'update' %] - [% item = cart.items(id=CGI.param('id')) %] + [% item = cart.items(id=CGI.param('id')).first %] [% IF item %] [% CALL item.quantity(CGI.param('quantity')) %] [% CALL item.update %] @@ -45,7 +45,8 @@ <th>Total</th> <th></th> </tr> - [% FOREACH item = cart.items %] + [% items = cart.items %] + [% WHILE (item = items.next) %] <tr> <td> <a href="products.tt2#[% item.sku %]" title="Read demo/tt2/cart.tt2 @@ -17,8 +17,7 @@ Listen 9002 TT2Trim On TT2IncludePath C:\Development\CPAN\Handel\demo\tt2\includes - PerlSetVar HandelDBIName C:\Development\CPAN\Handel\demo\handel.db - PerlSetVar HandelDBIDriver "SQLite" + PerlSetVar HandelDBIDSN dbi:SQLite:dbname=C:\Development\CPAN\Handel\t\var\handel.db <Files *.tt2> SetHandler perl-script demo/tt2/httpd.conf.include @@ -1,4 +1,5 @@ # $Id$ +## no critic package AxKit::XSP::Handel::Cart; use strict; use warnings; @@ -148,7 +149,7 @@ BEGIN { my @context = 'root'; sub start_document { - return "use Handel::Cart;\n"; + return "use Handel::Cart;\nuse Handel::Compat::Currency;use Handel::Currency;\n"; }; sub quoted_text { @@ -171,7 +172,7 @@ sub uuid_start { my ($e, $tag, %attr) = @_; $e->start_expr($tag); - $e->append_to_script("Handel::Cart->uuid"); + $e->append_to_script("Handel::Cart->storage->new_uuid"); $e->end_expr($tag); return; @@ -181,8 +182,8 @@ sub new_start { my ($e, $tag, %attr) = @_; throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -234,14 +235,14 @@ sub new_results_start { my ($e, $tag, %attr) = @_; throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] !~ /^(new|add|cart(s?)|item(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] !~ /^(new|add|cart(s?)|item(s?))$/); push @context, $tag; return ' if (!$_xsp_handel_cart_called_new && scalar keys %_xsp_handel_cart_new_filter) { - $_xsp_handel_cart_cart = Handel::Cart->new(\%_xsp_handel_cart_new_filter); + $_xsp_handel_cart_cart = Handel::Cart->create(\%_xsp_handel_cart_new_filter); $_xsp_handel_cart_called_new = 1; }; if ($_xsp_handel_cart_cart) { @@ -365,14 +366,14 @@ sub new_results_shopper_start { ## cart:uuid if ($tag =~ /^(g|u)uid$/) { $e->start_expr($tag); - $e->append_to_script("Handel::Cart->uuid"); + $e->append_to_script("Handel::Cart->storage->new_uuid"); $e->end_expr($tag); ## cart:new } elsif ($tag eq 'new') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -387,8 +388,8 @@ sub new_results_shopper_start { ## cart:restore } elsif ($tag eq 'restore') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] =~ /^(cart(s?))$/); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] =~ /^(cart(s?))$/); push @context, $tag; @@ -404,8 +405,8 @@ sub new_results_shopper_start { ## cart:cart } elsif ($tag eq 'cart') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -420,8 +421,8 @@ sub new_results_shopper_start { ## cart:carts } elsif ($tag eq 'carts') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -436,8 +437,8 @@ sub new_results_shopper_start { ## cart:item } elsif ($tag eq 'item') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] =~ /^(cart(s?))$/); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] =~ /^(cart(s?))$/); push @context, $tag; @@ -452,8 +453,8 @@ sub new_results_shopper_start { ## cart:items } elsif ($tag eq 'items') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] =~ /^(cart(s?))$/); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] =~ /^(cart(s?))$/); push @context, $tag; @@ -468,8 +469,8 @@ sub new_results_shopper_start { ## cart:clear } elsif ($tag eq 'clear') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(cart(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(cart(s?))$/); return "\n\$_xsp_handel_cart_cart->clear;\n"; @@ -477,8 +478,8 @@ sub new_results_shopper_start { ## cart:add } elsif ($tag eq 'add') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(new|cart(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(new|cart(s?))$/); push @context, $tag; @@ -493,14 +494,14 @@ sub new_results_shopper_start { ## cart:update } elsif ($tag eq 'update') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^((cart(s?)|item(s?)))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^((cart(s?)|item(s?)))$/); push @context, $tag; - if ($context[$#context-2] =~ /^(cart(s?))$/) { + if ($context[-3] =~ /^(cart(s?))$/) { return "\n\$_xsp_handel_cart_cart->autoupdate(0);\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_cart_item->autoupdate(0);\n"; }; @@ -509,8 +510,8 @@ sub new_results_shopper_start { } elsif ($tag eq 'save') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context-1] !~ /^(cart(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-2] !~ /^(cart(s?))$/); return ' $_xsp_handel_cart_cart->save; @@ -520,8 +521,8 @@ sub new_results_shopper_start { ## cart:delete } elsif ($tag eq 'delete') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(cart(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(cart(s?))$/); push @context, $tag; @@ -535,11 +536,11 @@ sub new_results_shopper_start { ## cart property tags ## cart:description, id, name, shopper, type, count, subtotal } elsif ($tag =~ /^(description|id|name|shopper|type|count|subtotal)$/) { - if ($context[$#context] eq 'new' && $tag !~ /^(count|subtotal)$/) { + if ($context[-1] eq 'new' && $tag !~ /^(count|subtotal)$/) { return "\n\$_xsp_handel_cart_new_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'add' && $tag =~ /^(id|description)$/) { + } elsif ($context[-1] eq 'add' && $tag =~ /^(id|description)$/) { return "\n\$_xsp_handel_cart_add_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] =~ /^(new|cart(s?))$/) { + } elsif ($context[-1] eq 'results' && $context[-2] =~ /^(new|cart(s?))$/) { $e->start_expr($tag); if ($tag eq 'subtotal' && ($attr{'format'} || $attr{'convert'})) { @@ -552,32 +553,34 @@ sub new_results_shopper_start { AxKit::Debug(5, "[Handel] [Cart] [$tag] code=$code, format=$format, from=$from, to=$to"); if ($attr{'convert'}) { - $e->append_to_script("\$_xsp_handel_cart_cart->$tag->convert('$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::convert(Handel::Compat::Currency->new(\$_xsp_handel_cart_cart->$tag->value), '$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); } elsif ($attr{'format'}) { - $e->append_to_script("\$_xsp_handel_cart_cart->$tag->format('$code', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::format(Handel::Compat::Currency->new(\$_xsp_handel_cart_cart->$tag->value), '$code', '$format');\n"); }; + } elsif ($tag eq 'subtotal') { + $e->append_to_script("\$_xsp_handel_cart_cart->$tag->value;\n"); } else { $e->append_to_script("\$_xsp_handel_cart_cart->$tag;\n"); }; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'item') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'item') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'items') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'items') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return "\n\$_xsp_handel_cart_delete_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'update') { + } elsif ($context[-1] eq 'update') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) ) if ($tag eq 'id'); - if ($context[$#context-2] =~ /^(cart(s?))$/) { + if ($context[-3] =~ /^(cart(s?))$/) { return "\n\$_xsp_handel_cart_cart->$tag(''"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_cart_item->$tag(''"; }; }; @@ -586,12 +589,12 @@ sub new_results_shopper_start { ## cart item property tags ## cart:sku, price, quantity, total } elsif ($tag =~ /^(sku|price|quantity|total)$/) { - if ($context[$#context] eq 'add' && $tag ne 'total') { + if ($context[-1] eq 'add' && $tag ne 'total') { return "\n\$_xsp_handel_cart_add_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { - $e->start_expr($tag); - $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] =~ /^item(s?)$/) { + #} elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { + # $e->start_expr($tag); + # $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); + } elsif ($context[-1] eq 'results' && $context[-2] =~ /^(item(s?)|add)$/) { $e->start_expr($tag); if ($tag =~ /^(price|total)$/ && ($attr{'format'} || $attr{'convert'})) { @@ -604,19 +607,21 @@ sub new_results_shopper_start { AxKit::Debug(5, "[Handel] [Cart] [$tag] code=$code, format=$format, from=$from, to=$to"); if ($attr{'convert'}) { - $e->append_to_script("\$_xsp_handel_cart_item->$tag->convert('$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::convert(Handel::Compat::Currency->new(\$_xsp_handel_cart_item->$tag->value), '$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); } elsif ($attr{'format'}) { - $e->append_to_script("\$_xsp_handel_cart_item->$tag->format('$code', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::format(Handel::Compat::Currency->new(\$_xsp_handel_cart_item->$tag->value), '$code', '$format');\n"); }; + } elsif ($tag =~ /^(price|total)$/) { + $e->append_to_script("\$_xsp_handel_cart_item->$tag->value;\n"); } else { $e->append_to_script("\$_xsp_handel_cart_item->$tag;\n"); }; - } elsif ($context[$#context] eq 'delete') { + } elsif ($context[-1] eq 'delete') { return "\n\$_xsp_handel_cart_delete_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(cart(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(cart(s?))$/) { return "\n\$_xsp_handel_cart_cart->$tag(''"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_cart_item->$tag(''"; }; }; @@ -626,15 +631,15 @@ sub new_results_shopper_start { } elsif ($tag eq 'filter') { my $key = $attr{'name'} || 'id'; - if ($context[$#context] eq 'cart') { + if ($context[-1] eq 'cart') { return "\n\$_xsp_handel_cart_load_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'carts') { + } elsif ($context[-1] eq 'carts') { return "\n\$_xsp_handel_carts_load_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'item') { + } elsif ($context[-1] eq 'item') { return "\n\$_xsp_handel_cart_item_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'items') { + } elsif ($context[-1] eq 'items') { return "\n\$_xsp_handel_cart_items_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'restore') { + } elsif ($context[-1] eq 'restore') { return "\n\$_xsp_handel_cart_restore_filter{'$key'} = ''"; }; @@ -642,65 +647,65 @@ sub new_results_shopper_start { ## cart:results } elsif ($tag =~ /^result(s?)$/) { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] !~ /^(new|add|cart(s?)|item(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] !~ /^(new|add|cart(s?)|item(s?))$/); push @context, $tag; - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { return ' if (!$_xsp_handel_cart_called_new && scalar keys %_xsp_handel_cart_new_filter) { - $_xsp_handel_cart_cart = Handel::Cart->new(\%_xsp_handel_cart_new_filter); + $_xsp_handel_cart_cart = Handel::Cart->create(\%_xsp_handel_cart_new_filter); $_xsp_handel_cart_called_new = 1; }; if ($_xsp_handel_cart_cart) { '; - } elsif ($context[$#context-1] eq 'cart') { + } elsif ($context[-2] eq 'cart') { return ' if (!$_xsp_handel_cart_called_load) { $_xsp_handel_cart_cart = (scalar keys %_xsp_handel_cart_load_filter) ? - Handel::Cart->load(\%_xsp_handel_cart_load_filter, 1)->next : - Handel::Cart->load(undef, 1)->next; + Handel::Cart->search(\%_xsp_handel_cart_load_filter)->next : + Handel::Cart->search->next; $_xsp_handel_cart_called_load = 1; }; if ($_xsp_handel_cart_cart) { '; - } elsif ($context[$#context-1] eq 'carts') { + } elsif ($context[-2] eq 'carts') { return ' if (!$_xsp_handel_carts_called_load) { @_xsp_handel_cart_carts = (scalar keys %_xsp_handel_carts_load_filter) ? - Handel::Cart->load(\%_xsp_handel_carts_load_filter) : - Handel::Cart->load(); + Handel::Cart->search(\%_xsp_handel_carts_load_filter) : + Handel::Cart->search; $_xsp_handel_carts_called_load = 1; }; foreach my $_xsp_handel_cart_cart (@_xsp_handel_cart_carts) { '; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { return ' if (!$_xsp_handel_cart_called_item) { $_xsp_handel_cart_item = (scalar keys %_xsp_handel_cart_item_filter) ? - $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_item_filter, 1)->next : - $_xsp_handel_cart_cart->items(undef, 1)->next; + $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_item_filter)->next : + $_xsp_handel_cart_cart->items->next; $_xsp_handel_cart_called_item = 1; }; if ($_xsp_handel_cart_item) { '; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { return ' if (!$_xsp_handel_cart_called_items) { @_xsp_handel_cart_items = (scalar keys %_xsp_handel_cart_items_filter) ? $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_items_filter) : - $_xsp_handel_cart_cart->items(); + $_xsp_handel_cart_cart->items; $_xsp_handel_cart_called_items = 1; }; foreach my $_xsp_handel_cart_item (@_xsp_handel_cart_items) { '; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { return ' if (!$_xsp_handel_cart_called_add && scalar keys %_xsp_handel_cart_add_filter) { $_xsp_handel_cart_item = $_xsp_handel_cart_cart->add(\%_xsp_handel_cart_add_filter); @@ -715,60 +720,60 @@ sub new_results_shopper_start { ## cart:no-results } elsif ($tag =~ /^no-result(s?)$/) { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] !~ /^(new|add|cart(s?)|item(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] !~ /^(new|add|cart(s?)|item(s?))$/); push @context, $tag; - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { return ' if (!$_xsp_handel_cart_called_new && scalar keys %_xsp_handel_cart_new_filter) { - $_xsp_handel_cart_cart = Handel::Cart->new(\%_xsp_handel_cart_new_filter); + $_xsp_handel_cart_cart = Handel::Cart->create(\%_xsp_handel_cart_new_filter); $_xsp_handel_cart_called_new = 1; }; if (!$_xsp_handel_cart_cart) { '; - } elsif ($context[$#context-1] eq 'cart') { + } elsif ($context[-2] eq 'cart') { return ' if (!$_xsp_handel_cart_called_load) { $_xsp_handel_cart_cart = (scalar keys %_xsp_handel_cart_load_filter) ? - Handel::Cart->load(\%_xsp_handel_cart_load_filter, 1)->next : - Handel::Cart->load(undef, 1)->next; + Handel::Cart->search(\%_xsp_handel_cart_load_filter)->next : + Handel::Cart->search->next; $_xsp_handel_cart_called_load = 1; }; if (!$_xsp_handel_cart_cart) { '; - } elsif ($context[$#context-1] eq 'carts') { + } elsif ($context[-2] eq 'carts') { return ' if (!$_xsp_handel_carts_called_load) { @_xsp_handel_cart_carts = (scalar keys %_xsp_handel_carts_load_filter) ? - Handel::Cart->load(\%_xsp_handel_carts_load_filter) : - Handel::Cart->load(); + Handel::Cart->search(\%_xsp_handel_carts_load_filter) : + Handel::Cart->search; $_xsp_handel_carts_called_load = 1; }; if (!scalar @_xsp_handel_cart_carts) { '; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { return ' if (!$_xsp_handel_cart_called_item) { $_xsp_handel_cart_item = (scalar keys %_xsp_handel_cart_item_filter) ? - $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_item_filter, 1)->next : - $_xsp_handel_cart_cart->items(undef, 1)->next; + $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_item_filter)->next : + $_xsp_handel_cart_cart->items->next; $_xsp_handel_cart_called_item = 1; }; if (!$_xsp_handel_cart_item) { '; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { return ' if (!$_xsp_handel_cart_called_items) { @_xsp_handel_cart_items = (scalar keys %_xsp_handel_cart_items_filter) ? $_xsp_handel_cart_cart->items(\%_xsp_handel_cart_items_filter) : - $_xsp_handel_cart_cart->items(); + $_xsp_handel_cart_cart->items; $_xsp_handel_cart_called_items = 1; }; if (!scalar @_xsp_handel_cart_items) { '; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { return ' if (!$_xsp_handel_cart_called_add && scalar keys %_xsp_handel_cart_add_filter) { $_xsp_handel_cart_item = $_xsp_handel_cart_cart->add(\%_xsp_handel_cart_add_filter); @@ -793,7 +798,7 @@ sub new_results_shopper_start { return ' if (!$_xsp_handel_cart_called_new && scalar keys %_xsp_handel_cart_new_filter) { - $_xsp_handel_cart_cart = Handel::Cart->new(\%_xsp_handel_cart_new_filter); + $_xsp_handel_cart_cart = Handel::Cart->create(\%_xsp_handel_cart_new_filter); $_xsp_handel_cart_called_new = 1; }; };'; @@ -853,15 +858,17 @@ sub new_results_shopper_start { ## cart:update } elsif ($tag eq 'update') { - if ($context[$#context-2] =~ /^(cart(s?))$/) { + if ($context[-3] =~ /^(cart(s?))$/) { pop @context; return ' $_xsp_handel_cart_cart->update; + $_xsp_handel_cart_cart->autoupdate(1); '; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { pop @context; return ' $_xsp_handel_cart_item->update; + $_xsp_handel_cart_item->autoupdate(1); '; }; @@ -882,18 +889,18 @@ sub new_results_shopper_start { ## cart propery tags ## cart:description, id, name, shopper, type, count, subtotal } elsif ($tag =~ /^(description|id|name|shopper|type|count|subtotal)$/) { - if ($context[$#context] eq 'new' && $tag !~ /^(count|subtotal)$/) { + if ($context[-1] eq 'new' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'add' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'add' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'results') { + } elsif ($context[-1] eq 'results') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(cart(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(cart(s?))$/) { return ");\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return ");\n"; }; }; @@ -902,20 +909,20 @@ sub new_results_shopper_start { ## cart item property tags ## cart:sku, price, quantity } elsif ($tag =~ /^(sku|price|quantity|total)$/) { - if ($context[$#context] eq 'add' && $tag ne 'total') { + if ($context[-1] eq 'add' && $tag ne 'total') { return ";\n"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'item') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'item') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'items') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'items') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(cart(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(cart(s?))$/) { return ");\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return ");\n"; }; }; @@ -923,42 +930,42 @@ sub new_results_shopper_start { ## cart:filter } elsif ($tag eq 'filter') { - if ($context[$#context] eq 'cart') { + if ($context[-1] eq 'cart') { return ";\n"; - } elsif ($context[$#context] eq 'carts') { + } elsif ($context[-1] eq 'carts') { return ";\n"; - } elsif ($context[$#context] eq 'item') { + } elsif ($context[-1] eq 'item') { return ";\n"; - } elsif ($context[$#context] eq 'items') { + } elsif ($context[-1] eq 'items') { return ";\n"; - } elsif ($context[$#context] eq 'restore') { + } elsif ($context[-1] eq 'restore') { return ";\n"; }; ## cart:results } elsif ($tag =~ /^result(s?)$/) { - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'cart') { + } elsif ($context[-2] eq 'cart') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'carts') { + } elsif ($context[-2] eq 'carts') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { pop @context; return "\n};\n"; @@ -968,27 +975,27 @@ sub new_results_shopper_start { ## cart:no-results } elsif ($tag =~ /^no-result(s?)$/) { - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'cart') { + } elsif ($context[-2] eq 'cart') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'carts') { + } elsif ($context[-2] eq 'carts') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { pop @context; return "\n};\n"; lib/AxKit/XSP/Handel/Cart.pm @@ -1,4 +1,5 @@ # $Id$ +## no critic package AxKit::XSP::Handel::Checkout; use strict; use warnings; @@ -42,8 +43,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Checkout'; if ($tag eq 'new') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -67,8 +68,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Checkout'; return $code; } elsif ($tag eq 'plugin') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] ne 'plugins'); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] ne 'plugins'); push @context, $tag; @@ -95,8 +96,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Checkout'; undef $property if ($property eq 'checkout'); throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] ne 'messages'); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] ne 'messages'); push @context, $tag; @@ -134,8 +135,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Checkout'; return $code; } elsif ($tag eq 'phase') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] ne 'phases'); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] ne 'phases'); push @context, $tag; lib/AxKit/XSP/Handel/Checkout.pm @@ -1,4 +1,5 @@ # $Id$ +## no critic package AxKit::XSP::Handel::Order; use strict; use warnings; @@ -28,7 +29,7 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; }; sub start_document { - return "use Handel::Order;\n"; + return "use Handel::Order;\nuse Handel::Compat::Currency;\n"; }; sub parse_char { @@ -50,21 +51,21 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; shiptocity|shiptostate|shiptozip|shiptocountry| shiptodayphone|shiptonightphone|shiptofax|shiptoemail| tax|subtotal|total||updated)$/x) { - if ($context[$#context] eq 'new') { + if ($context[-1] eq 'new') { return ".q|$text|"; - } elsif ($context[$#context] eq 'add') { + } elsif ($context[-1] eq 'add') { return ".q|$text|"; - } elsif ($context[$#context] eq 'delete') { + } elsif ($context[-1] eq 'delete') { return ".q|$text|"; - } elsif ($context[$#context] eq 'update') { + } elsif ($context[-1] eq 'update') { return ".q|$text|"; }; } elsif ($tag =~ /^(sku|price|quantity)$/) { - if ($context[$#context] eq 'add') { + if ($context[-1] eq 'add') { return ".q|$text|"; - } elsif ($context[$#context] eq 'delete') { + } elsif ($context[-1] eq 'delete') { return ".q|$text|"; - } elsif ($context[$#context] eq 'update') { + } elsif ($context[-1] eq 'update') { return ".q|$text|"; }; } elsif ($tag eq 'filter') { @@ -87,14 +88,14 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:uuid if ($tag =~ /^(g|u)uid$/) { $e->start_expr($tag); - $e->append_to_script("Handel::Order->uuid"); + $e->append_to_script("Handel::Order->storage->new_uuid"); $e->end_expr($tag); ## order:new } elsif ($tag eq 'new') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -112,8 +113,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:cart } elsif ($tag eq 'cart') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'new'); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'new'); push @context, $tag; @@ -127,8 +128,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:order } elsif ($tag eq 'order') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -143,8 +144,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:orders } elsif ($tag eq 'orders') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) - ) if ($context[$#context] ne 'root'); + -text => translate('TAG_NOT_ALLOWED_IN_OTHERS', $tag) + ) if ($context[-1] ne 'root'); push @context, $tag; @@ -159,8 +160,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:item } elsif ($tag eq 'item') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] =~ /^(order(s?))$/); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] =~ /^(order(s?))$/); push @context, $tag; @@ -175,8 +176,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:items } elsif ($tag eq 'items') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid inside of tag '" . $context[$#context] . "'", $tag) - ) if ($context[$#context] =~ /^(order(s?))$/); + -text => translate('Tag [_1] not valid inside of tag [_2]', $tag, $context[-1]) + ) if ($context[-1] =~ /^(order(s?))$/); push @context, $tag; @@ -191,8 +192,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:clear } elsif ($tag eq 'clear') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(order(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(order(s?))$/); return "\n\$_xsp_handel_order_order->clear;\n"; @@ -200,8 +201,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:add } elsif ($tag eq 'add') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(new|order(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(new|order(s?))$/); push @context, $tag; @@ -216,14 +217,14 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:update } elsif ($tag eq 'update') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^((order(s?)|item(s?)))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^((order(s?)|item(s?)))$/); push @context, $tag; - if ($context[$#context-2] =~ /^(order(s?))$/) { + if ($context[-3] =~ /^(order(s?))$/) { return "\n\$_xsp_handel_order_order->autoupdate(0);\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_order_item->autoupdate(0);\n"; }; @@ -232,8 +233,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; } elsif ($tag eq 'save') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context-1] !~ /^(order(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-2] !~ /^(order(s?))$/); return ' $_xsp_handel_order_order->save; @@ -243,8 +244,8 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:delete } elsif ($tag eq 'delete') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] ne 'results' || $context[$#context-1] !~ /^(order(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] ne 'results' || $context[-2] !~ /^(order(s?))$/); push @context, $tag; @@ -267,11 +268,11 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; shiptocity|shiptostate|shiptozip|shiptocountry| shiptodayphone|shiptonightphone|shiptofax|shiptoemail| tax|subtotal|updated)$/x) { - if ($context[$#context] eq 'new' && $tag !~ /^(count)$/) { + if ($context[-1] eq 'new' && $tag !~ /^(count)$/) { return "\n\$_xsp_handel_order_new_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'add' && $tag =~ /^(id|description)$/) { + } elsif ($context[-1] eq 'add' && $tag =~ /^(id|description)$/) { return "\n\$_xsp_handel_order_add_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] =~ /^(new|order(s?))$/) { + } elsif ($context[-1] eq 'results' && $context[-2] =~ /^(new|order(s?))$/) { $e->start_expr($tag); if ($tag =~ /^(subtotal|tax|handling|shipping)$/ && ($attr{'format'} || $attr{'convert'})) { @@ -284,32 +285,34 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; AxKit::Debug(5, "[Handel] [Order] [$tag] code=$code, format=$format, from=$from, to=$to"); if ($attr{'convert'}) { - $e->append_to_script("\$_xsp_handel_order_order->$tag->convert('$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::convert(Handel::Compat::Currency->new(\$_xsp_handel_order_order->$tag->value), '$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); } elsif ($attr{'format'}) { - $e->append_to_script("\$_xsp_handel_order_order->$tag->format('$code', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::format(Handel::Compat::Currency->new(\$_xsp_handel_order_order->$tag->value), '$code', '$format');\n"); }; + } elsif ($tag =~ /^(subtotal|tax|handling|shipping)$/) { + $e->append_to_script("\$_xsp_handel_order_order->$tag->value;\n"); } else { $e->append_to_script("\$_xsp_handel_order_order->$tag;\n"); }; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'item') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'item') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'items') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'items') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { $e->start_expr($tag); $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return "\n\$_xsp_handel_order_delete_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'update') { + } elsif ($context[-1] eq 'update') { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) ) if ($tag eq 'id'); - if ($context[$#context-2] =~ /^(order(s?))$/) { + if ($context[-3] =~ /^(order(s?))$/) { return "\n\$_xsp_handel_order_order->$tag(''"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_order_item->$tag(''"; }; }; @@ -318,14 +321,14 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order item property tags ## order:sku, price, quantity, total } elsif ($tag =~ /^(sku|price|quantity|total)$/) { - if ($context[$#context] eq 'new') { + if ($context[-1] eq 'new') { return "\n\$_xsp_handel_order_new_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'add') { + } elsif ($context[-1] eq 'add') { return "\n\$_xsp_handel_order_add_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { - $e->start_expr($tag); - $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] =~ /^(new|order(s?)|item(s?))$/) { + #} elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { + # $e->start_expr($tag); + # $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); + } elsif ($context[-1] eq 'results' && $context[-2] =~ /^(add|new|order(s?)|item(s?))$/) { $e->start_expr($tag); if ($tag =~ /^(price|total)$/ && ($attr{'format'} || $attr{'convert'})) { @@ -338,31 +341,37 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; AxKit::Debug(5, "[Handel] [Order] [$tag] code=$code, format=$format, from=$from, to=$to"); if ($attr{'convert'}) { - if ($context[$#context-1] =~ /^(new|order(s?))$/) { - $e->append_to_script("\$_xsp_handel_order_order->$tag->convert('$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); + if ($context[-2] =~ /^(new|order(s?))$/) { + $e->append_to_script("Handel::Compat::Currency::convert(Handel::Compat::Currency->new(\$_xsp_handel_order_order->$tag->value), '$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); } else { - $e->append_to_script("\$_xsp_handel_order_item->$tag->convert('$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::convert(Handel::Compat::Currency->new(\$_xsp_handel_order_item->$tag->value), '$from', '$to', '".($attr{'format'}||'')."', '$format');\n"); }; } elsif ($attr{'format'}) { - if ($context[$#context-1] =~ /^(new|order(s?))$/) { - $e->append_to_script("\$_xsp_handel_order_order->$tag->format('$code', '$format');\n"); + if ($context[-2] =~ /^(new|order(s?))$/) { + $e->append_to_script("Handel::Compat::Currency::format(Handel::Compat::Currency->new(\$_xsp_handel_order_order->$tag->value), '$code', '$format');\n"); } else { - $e->append_to_script("\$_xsp_handel_order_item->$tag->format('$code', '$format');\n"); + $e->append_to_script("Handel::Compat::Currency::format(Handel::Compat::Currency->new(\$_xsp_handel_order_item->$tag->value), '$code', '$format');\n"); }; }; + } elsif ($tag =~ /^(price|total)$/) { + if ($context[-2] =~ /^(new|order(s?))$/) { + $e->append_to_script("\$_xsp_handel_order_order->$tag->value;\n"); + } else { + $e->append_to_script("\$_xsp_handel_order_item->$tag->value;\n"); + }; } else { - if ($context[$#context-1] =~ /^(new|order(s?))$/) { + if ($context[-2] =~ /^(new|order(s?))$/) { $e->append_to_script("\$_xsp_handel_order_order->$tag;\n"); } else { $e->append_to_script("\$_xsp_handel_order_item->$tag;\n"); }; }; - } elsif ($context[$#context] eq 'delete') { + } elsif ($context[-1] eq 'delete') { return "\n\$_xsp_handel_order_delete_filter{$tag} = ''"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(order(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(order(s?))$/) { return "\n\$_xsp_handel_order_order->$tag(''"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return "\n\$_xsp_handel_order_item->$tag(''"; }; }; @@ -372,15 +381,15 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; } elsif ($tag eq 'filter') { my $key = $attr{'name'} || 'id'; - if ($context[$#context] eq 'order') { + if ($context[-1] eq 'order') { return "\n\$_xsp_handel_order_load_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'orders') { + } elsif ($context[-1] eq 'orders') { return "\n\$_xsp_handel_orders_load_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'item') { + } elsif ($context[-1] eq 'item') { return "\n\$_xsp_handel_order_item_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'items') { + } elsif ($context[-1] eq 'items') { return "\n\$_xsp_handel_order_items_filter{'$key'} = ''"; - } elsif ($context[$#context] eq 'cart') { + } elsif ($context[-1] eq 'cart') { return "\n\$_xsp_handel_order_new_cart_filter{'$key'} = ''"; }; @@ -388,65 +397,65 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:results } elsif ($tag =~ /^result(s?)$/) { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] !~ /^(new|add|order(s?)|item(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] !~ /^(new|add|order(s?)|item(s?))$/); push @context, $tag; - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { return ' if (!$_xsp_handel_order_called_new && scalar keys %_xsp_handel_order_new_filter) { - $_xsp_handel_order_order = Handel::Order->new(\%_xsp_handel_order_new_filter, $_xsp_handel_order_new_process); + $_xsp_handel_order_order = Handel::Order->create(\%_xsp_handel_order_new_filter, $_xsp_handel_order_new_process); $_xsp_handel_order_called_new = 1; }; if ($_xsp_handel_order_order) { '; - } elsif ($context[$#context-1] eq 'order') { + } elsif ($context[-2] eq 'order') { return ' if (!$_xsp_handel_order_called_load) { $_xsp_handel_order_order = (scalar keys %_xsp_handel_order_load_filter) ? - Handel::Order->load(\%_xsp_handel_order_load_filter, 1)->next : - Handel::Order->load(undef, 1)->next; + Handel::Order->search(\%_xsp_handel_order_load_filter)->next : + Handel::Order->search->next; $_xsp_handel_order_called_load = 1; }; if ($_xsp_handel_order_order) { '; - } elsif ($context[$#context-1] eq 'orders') { + } elsif ($context[-2] eq 'orders') { return ' if (!$_xsp_handel_orders_called_load) { @_xsp_handel_order_orders = (scalar keys %_xsp_handel_orders_load_filter) ? - Handel::Order->load(\%_xsp_handel_orders_load_filter) : - Handel::Order->load(); + Handel::Order->search(\%_xsp_handel_orders_load_filter) : + Handel::Order->search; $_xsp_handel_orders_called_load = 1; }; foreach my $_xsp_handel_order_order (@_xsp_handel_order_orders) { '; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { return ' if (!$_xsp_handel_order_called_item) { $_xsp_handel_order_item = (scalar keys %_xsp_handel_order_item_filter) ? - $_xsp_handel_order_order->items(\%_xsp_handel_order_item_filter, 1)->next : - $_xsp_handel_order_order->items(undef, 1)->next; + $_xsp_handel_order_order->items(\%_xsp_handel_order_item_filter)->next : + $_xsp_handel_order_order->items->next; $_xsp_handel_order_called_item = 1; }; if ($_xsp_handel_order_item) { '; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { return ' if (!$_xsp_handel_order_called_items) { @_xsp_handel_order_items = (scalar keys %_xsp_handel_order_items_filter) ? $_xsp_handel_order_order->items(\%_xsp_handel_order_items_filter) : - $_xsp_handel_order_order->items(); + $_xsp_handel_order_order->items; $_xsp_handel_order_called_items = 1; }; foreach my $_xsp_handel_order_item (@_xsp_handel_order_items) { '; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { return ' if (!$_xsp_handel_order_called_add && scalar keys %_xsp_handel_order_add_filter) { $_xsp_handel_order_item = $_xsp_handel_order_order->add(\%_xsp_handel_order_add_filter); @@ -461,60 +470,60 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:no-results } elsif ($tag =~ /^no-result(s?)$/) { throw Handel::Exception::Taglib( - -text => translate("Tag '[_1]' not valid here", $tag) - ) if ($context[$#context] !~ /^(new|add|order(s?)|item(s?))$/); + -text => translate('TAG_NOT_ALLOWED_HERE', $tag) + ) if ($context[-1] !~ /^(new|add|order(s?)|item(s?))$/); push @context, $tag; - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { return ' if (!$_xsp_handel_order_called_new && scalar keys %_xsp_handel_order_new_filter) { - $_xsp_handel_order_order = Handel::Order->new(\%_xsp_handel_order_new_filter, $_xsp_handel_order_new_process); + $_xsp_handel_order_order = Handel::Order->create(\%_xsp_handel_order_new_filter, $_xsp_handel_order_new_process); $_xsp_handel_order_called_new = 1; }; if (!$_xsp_handel_order_order) { '; - } elsif ($context[$#context-1] eq 'order') { + } elsif ($context[-2] eq 'order') { return ' if (!$_xsp_handel_order_called_load) { $_xsp_handel_order_order = (scalar keys %_xsp_handel_order_load_filter) ? - Handel::Order->load(\%_xsp_handel_order_load_filter, 1)->next : - Handel::Order->load(undef, 1)->next; + Handel::Order->search(\%_xsp_handel_order_load_filter)->next : + Handel::Order->search->next; $_xsp_handel_order_called_load = 1; }; if (!$_xsp_handel_order_order) { '; - } elsif ($context[$#context-1] eq 'orders') { + } elsif ($context[-2] eq 'orders') { return ' if (!$_xsp_handel_orders_called_load) { @_xsp_handel_order_orders = (scalar keys %_xsp_handel_orders_load_filter) ? - Handel::Order->load(\%_xsp_handel_orders_load_filter) : - Handel::Order->load(); + Handel::Order->search(\%_xsp_handel_orders_load_filter) : + Handel::Order->search; $_xsp_handel_orders_called_load = 1; }; if (!scalar @_xsp_handel_order_orders) { '; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { return ' if (!$_xsp_handel_order_called_item) { $_xsp_handel_order_item = (scalar keys %_xsp_handel_order_item_filter) ? - $_xsp_handel_order_order->items(\%_xsp_handel_order_item_filter, 1)->next : - $_xsp_handel_order_order->items(undef, 1)->next; + $_xsp_handel_order_order->items(\%_xsp_handel_order_item_filter)->next : + $_xsp_handel_order_order->items->next; $_xsp_handel_order_called_item = 1; }; if (!$_xsp_handel_order_item) { '; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { return ' if (!$_xsp_handel_order_called_items) { @_xsp_handel_order_items = (scalar keys %_xsp_handel_order_items_filter) ? $_xsp_handel_order_order->items(\%_xsp_handel_order_items_filter) : - $_xsp_handel_order_order->items(); + $_xsp_handel_order_order->items; $_xsp_handel_order_called_items = 1; }; if (!scalar @_xsp_handel_order_items) { '; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { return ' if (!$_xsp_handel_order_called_add && scalar keys %_xsp_handel_order_add_filter) { $_xsp_handel_order_item = $_xsp_handel_order_order->add(\%_xsp_handel_order_add_filter); @@ -539,7 +548,7 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; return ' if (!$_xsp_handel_order_called_new && scalar keys %_xsp_handel_order_new_filter) { - $_xsp_handel_order_order = Handel::Order->new(\%_xsp_handel_order_new_filter); + $_xsp_handel_order_order = Handel::Order->create(\%_xsp_handel_order_new_filter); $_xsp_handel_order_called_new = 1; }; };'; @@ -599,15 +608,17 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:update } elsif ($tag eq 'update') { - if ($context[$#context-2] =~ /^(order(s?))$/) { + if ($context[-3] =~ /^(order(s?))$/) { pop @context; return ' $_xsp_handel_order_order->update; + $_xsp_handel_order_order->autoupdate(1); '; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { pop @context; return ' $_xsp_handel_order_item->update; + $_xsp_handel_order_item->autoupdate(1); '; }; @@ -636,18 +647,18 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; shiptocity|shiptostate|shiptozip|shiptocountry| shiptodayphone|shiptonightphone|shiptofax|shiptoemail| tax|subtotal|updated)$/x) { - if ($context[$#context] eq 'new' && $tag !~ /^(count)$/) { + if ($context[-1] eq 'new' && $tag !~ /^(count)$/) { return ";\n"; - } elsif ($context[$#context] eq 'add' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'add' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'results') { + } elsif ($context[-1] eq 'results') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(order(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(order(s?))$/) { return ");\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return ");\n"; }; }; @@ -656,28 +667,28 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order item property tags ## order:sku, price, quantity } elsif ($tag =~ /^(sku|price|quantity|total)$/) { - if ($context[$#context] eq 'add') { + if ($context[-1] eq 'add') { return ";\n"; - } elsif ($context[$#context] eq 'new') { + } elsif ($context[-1] eq 'new') { return ";\n"; - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'new') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'new') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'add') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'add') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'item') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'item') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'items') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'items') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'order') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'order') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'results' && $context[$#context-1] eq 'orders') { + } elsif ($context[-1] eq 'results' && $context[-2] eq 'orders') { $e->end_expr($tag); - } elsif ($context[$#context] eq 'delete' && $tag !~ /^(count|subtotal)$/) { + } elsif ($context[-1] eq 'delete' && $tag !~ /^(count|subtotal)$/) { return ";\n"; - } elsif ($context[$#context] eq 'update') { - if ($context[$#context-2] =~ /^(order(s?))$/) { + } elsif ($context[-1] eq 'update') { + if ($context[-3] =~ /^(order(s?))$/) { return ");\n"; - } elsif ($context[$#context-2] =~ /^(item(s?))$/) { + } elsif ($context[-3] =~ /^(item(s?))$/) { return ");\n"; }; }; @@ -685,44 +696,44 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:filter } elsif ($tag eq 'filter') { - if ($context[$#context] eq 'order') { + if ($context[-1] eq 'order') { return ";\n"; - } elsif ($context[$#context] eq 'orders') { + } elsif ($context[-1] eq 'orders') { return ";\n"; - } elsif ($context[$#context] eq 'item') { + } elsif ($context[-1] eq 'item') { return ";\n"; - } elsif ($context[$#context] eq 'items') { + } elsif ($context[-1] eq 'items') { return ";\n"; - } elsif ($context[$#context] eq 'restore') { + } elsif ($context[-1] eq 'restore') { return ";\n"; - } elsif ($context[$#context] eq 'cart') { + } elsif ($context[-1] eq 'cart') { return ";\n"; }; ## order:results } elsif ($tag =~ /^result(s?)$/) { - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'order') { + } elsif ($context[-2] eq 'order') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'orders') { + } elsif ($context[-2] eq 'orders') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { pop @context; return "\n};\n"; @@ -732,27 +743,27 @@ $NS = 'http://today.icantfocus.com/CPAN/AxKit/XSP/Handel/Order'; ## order:no-results } elsif ($tag =~ /^no-result(s?)$/) { - if ($context[$#context-1] eq 'new') { + if ($context[-2] eq 'new') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'order') { + } elsif ($context[-2] eq 'order') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'orders') { + } elsif ($context[-2] eq 'orders') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'item') { + } elsif ($context[-2] eq 'item') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'items') { + } elsif ($context[-2] eq 'items') { pop @context; return "\n};\n"; - } elsif ($context[$#context-1] eq 'add') { + } elsif ($context[-2] eq 'add') { pop @context; return "\n};\n"; lib/AxKit/XSP/Handel/Order.pm @@ -1,9 +1,51 @@ # $Id$ +## no critic (ProhibitCaptureWithoutTest) package Catalyst::Helper::Controller::Handel::Cart; use strict; use warnings; -use Path::Class; -use Catalyst 5.56; + +BEGIN { + use Catalyst 5.7001; + use Catalyst::Utils; + use Path::Class; +}; + +=head1 NAME + +Catalyst::Helper::Controller::Handel::Cart - Helper for Handel::Cart Controllers + +=head1 SYNOPSIS + + script/create.pl controller <newclass> Handel::Cart [<modelclass> <checkoutcontroller>] + script/create.pl controller Cart Handel::Cart Cart Checkout + +=head1 DESCRIPTION + +A Helper for creating controllers based on Handel::Cart objects. If no modelclass +is specified, ::M::Cart is assumed. + +Both the modelclass and checkoutcontroller arguments try to do the right thing with the +names given to them. + +For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully +qualified package name: + + MyApp::M::CartModel + MyApp::Model::CartModel + CartModel + +In all three cases everything before M{odel)|C(ontroller) will be stripped and the class CartModel +will be used. + +B<The code generated by this helper requires FormValidator::Simple and YAML to be installed to operate.> + +=head1 METHODS + +=head2 mk_compclass + +Makes a Handel::Cart Controller class and template files for you. + +=cut sub mk_compclass { my ($self, $helper, $model, $checkout) = @_; @@ -13,586 +55,492 @@ sub mk_compclass { $model ||= 'Cart'; $checkout ||= 'Checkout'; - $model = $model =~ /^(.*::M(odel)?::)?(.*)$/i ? $3 : 'Cart'; + $model =~ /^(.*::M(odel)?::)?(.*)$/i; + $model = $3 ? $3 : 'Cart'; $helper->{'model'} = $model; - my $couri = $checkout =~ /^(.*::C(ontroller)?::)?(.*)$/i ? lc($3) : 'checkout'; + $checkout =~ /^(.*::C(ontroller)?::)?(.*)$/i; + my $couri = $3 ? lc($3) : 'checkout'; $couri =~ s/::/\//g; $helper->{'couri'} = $couri; + + $helper->{'action'} = Catalyst::Utils::class2prefix($helper->{'class'}); + $helper->mk_dir($dir); $helper->render_file('controller', $file); - $helper->render_file('view', file($dir, 'view.tt')); - $helper->render_file('list', file($dir, 'list.tt')); + + $helper->render_file('default', file($dir, 'default')); + $helper->render_file('list', file($dir, 'list')); + $helper->render_file('errors', file($dir, 'errors')); + $helper->render_file('profiles', file($dir, 'profiles.yml')); + $helper->render_file('messages', file($dir, 'messages.yml')); + + $helper->render_file('products', file($helper->{'base'}, 'root', 'static', 'products.htm')); + + return 1; }; +=head2 mk_comptest + +Makes a Handel::Cart Controller test for you. + +=cut + sub mk_comptest { my ($self, $helper) = @_; my $test = $helper->{'test'}; $helper->render_file('test', $test); + + return 1; }; +=head1 SEE ALSO + +L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Cart> + +=head1 AUTHOR + + Christopher H. Laco + CPAN ID: CLACO + claco@chrislaco.com + http://today.icantfocus.com/blog/ + +=cut + 1; __DATA__ + +=begin pod_to_ignore + __controller__ package [% class %]; use strict; use warnings; -use Handel::Constants qw(:returnas :cart); -use Data::FormValidator 4.00; -use base 'Catalyst::Base'; - -our $DFV; - -# Until this patch [hopefully] get's dumped into DFV 4.03, I've inlined the msgs -# method below with the following path applied to it: -# -#--- Results.pm.orig Wed Aug 31 22:27:27 2005 -#+++ Results.pm Wed Sep 14 17:40:28 2005 -#@@ -584,7 +584,9 @@ -# if ($self->has_missing) { -# my $missing = $self->missing; -# for my $m (@$missing) { -#- $msgs{$m} = _error_msg_fmt($profile{format},$profile{missing}); -#+ $msgs{$m} = _error_msg_fmt($profile{format}, -#+ (ref $profile{missing} eq 'HASH' ? -#+ ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); -# } -# } BEGIN { - eval 'use Data::FormValidator 4.00'; - if (!$@) { - ############################################################# - # This is here until the patch makes it to release - ############################################################# - no warnings 'redefine'; - sub Data::FormValidator::Results::msgs { - my $self = shift; - my $controls = shift || {}; - if (defined $controls and ref $controls ne 'HASH') { - die "$0: parameter passed to msgs must be a hash ref"; - } - - - # Allow msgs to be called more than one to accumulate error messages - $self->{msgs} ||= {}; - $self->{profile}{msgs} ||= {}; - $self->{msgs} = { %{ $self->{msgs} }, %$controls }; - - # Legacy typo support. - for my $href ($self->{msgs}, $self->{profile}{msgs}) { - if ( - (not defined $href->{invalid_separator}) - && (defined $href->{invalid_seperator}) - ) { - $href->{invalid_separator} = $href->{invalid_seperator}; - } - } - - my %profile = ( - prefix => '', - missing => 'Missing', - invalid => 'Invalid', - invalid_separator => ' ', - - format => '<span style="color:red;font-weight:bold"><span class="dfv_errors">* %s</span></span>', - %{ $self->{msgs} }, - %{ $self->{profile}{msgs} }, - ); - - - my %msgs = (); - - # Add invalid messages to hash - # look at all the constraints, look up their messages (or provide a default) - # add field + formatted constraint message to hash - if ($self->has_invalid) { - my $invalid = $self->invalid; - for my $i ( keys %$invalid ) { - $msgs{$i} = join $profile{invalid_separator}, map { - Data::FormValidator::Results::_error_msg_fmt($profile{format},($profile{constraints}{$_} || $profile{invalid})) - } @{ $invalid->{$i} }; - } - } - - # Add missing messages, if any - if ($self->has_missing) { - my $missing = $self->missing; - for my $m (@$missing) { - $msgs{$m} = Data::FormValidator::Results::_error_msg_fmt($profile{format}, - (ref $profile{missing} eq 'HASH' ? - ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); - } - } - - my $msgs_ref = Data::FormValidator::Results::prefix_hash($profile{prefix},\%msgs); - - $msgs_ref->{ $profile{any_errors} } = 1 if defined $profile{any_errors}; - - return $msgs_ref; - } - ############################################################# - - $DFV = Data::FormValidator->new({ - cart_add => { - required => [qw/sku quantity/], - optional => [qw/price description/], - field_filters => { - sku => ['trim'], - quantity => ['pos_integer'], - price => ['pos_decimal'], - description => ['trim'] - }, - msgs => { - missing => { - default => 'Field is blank!', - sku => 'The SKU field is required', - quantity => 'The quantity field is required and must be a positive number' - }, - format => '%s' - } - }, - cart_update => { - required => [qw/id quantity/], - field_filters => { - id => ['trim'], - quantity => ['pos_integer'] - }, - msgs => { - missing => { - default => 'Field is blank!', - id => 'The Id field is required for updating a cart item', - quantity => 'The quantity field is required and must be a positive number' - }, - format => '%s' - } - }, - cart_delete => { - required => ['id'], - field_filters => { - id => ['trim'] - }, - msgs => { - missing => { - id => 'The Id field is required for delete a cart item' - }, - format => '%s' - } - }, - cart_save => { - required => [qw/name/], - field_filters => { - name => ['trim'] - }, - msgs => { - missing => { - default => 'Field is blank', - name => 'The Name field is required to save a cart' - }, - format => '%s' - } - }, - cart_restore => { - required => [qw/id mode/], - field_filters => { - id => ['trim'], - mode => ['digit'] - }, - msgs => { - missing => { - default => 'Field is blank', - id => 'The id field is required for restoring saved cartds', - mode => 'The mode field is required for restoring saved carts' - }, - format => '%s' - } - }, - cart_destroy => { - required => ['id'], - field_filters => { - id => ['trim'] - }, - msgs => { - missing => { - id => 'The Id field is required for deleting saved carts' - }, - format => '%s' - } - }, - }); - }; + use base qw/Catalyst::Controller/; + use Handel::Constants qw/:cart/; + use FormValidator::Simple 0.17; + use YAML; }; -sub begin : Private { - my ($self, $c) = @_; +=head1 NAME - if (!$c->req->cookie('shopperid')) { - $c->stash->{'shopperid'} = $c->model('[% model %]')->uuid; - $c->res->cookies->{'shopperid'} = {value => $c->stash->{'shopperid'}, path => '/'}; +[% class %] - Catalyst Controller - $c->stash->{'cart'} = $c->model('[% model %]')->new({ - shopper => $c->stash->{'shopperid'}, - type => CART_TYPE_TEMP - }); - } else { - $c->stash->{'shopperid'} = $c->req->cookie('shopperid')->value; +=head1 DESCRIPTION - $c->stash->{'cart'} = $c->model('[% model %]')->load({ - shopper => $c->stash->{'shopperid'}, - type => CART_TYPE_TEMP - }, RETURNAS_ITERATOR)->first; +Catalyst Controller. - if (!$c->stash->{'cart'}) { - $c->stash->{'cart'} = $c->model('[% model %]')->new({ - shopper => $c->stash->{'shopperid'}, - type => CART_TYPE_TEMP - }); - }; - }; -}; +=head1 METHODS -sub end : Private { - my ($self, $c) = @_; +=head2 COMPONENT - $c->forward($c->view('TT')) - unless ( $c->res->output || $c->res->body || ! $c->stash->{template} ); -}; +=cut -sub default : Private { - my ($self, $c) = @_; +sub COMPONENT { + my $self = shift->NEXT::COMPONENT(@_); - $c->forward('view'); -}; + $self->{'validator'} = FormValidator::Simple->new; + $self->{'validator'}->set_messages( + $_[0]->path_to('root', '[% action %]', 'messages.yml') + ); -sub view : Local { - my ($self, $c) = @_; + $self->{'profiles'} = YAML::LoadFile($_[0]->path_to('root', '[% action %]', 'profiles.yml')); - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; + return $self; }; -sub add : Local { - my ($self, $c) = @_; - my @messages; - my $sku = $c->request->param('sku'); - my $quantity = $c->request->param('quantity'); - my $price = $c->request->param('price'); - my $description = $c->request->param('description'); +=head2 default - if ($c->req->method eq 'POST') { - my $results; +Default action when browsing to [% uri %]/. If no session exists, or the shopper +id isn't set, no cart will be loaded. This keeps non-shoppers like Google +and others from wasting sessions and cart records for no good reason. - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_add'); - }; +=cut - if ($results || !$DFV) { - if ($results) { - $sku = $results->valid('sku'); - $quantity = $results->valid('quantity'); - $price = $results->valid('price'); - $description = $results->valid('description'); - }; - - $quantity ||= 1; +sub default : Private { + my ($self, $c) = @_; + $c->stash->{'template'} = '[% action %]/default'; - eval { - $c->stash->{'cart'}->add({ - sku => $sku, - quantity => $quantity, - price => $price, - description => $description - }); - }; - if ($@) { - push @messages, $@; - }; - } else { - push @messages, map {$_} values %{$results->msgs}; + if ($c->sessionid && $c->session->{'shopper'}) { + if (my $cart = $c->forward('load')) { + $c->stash->{'cart'} = $cart; + $c->stash->{'items'} = $cart->items; }; }; - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; - $c->stash->{'messages'} = \@messages; - } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); - }; + return; }; -sub update : Local { - my ($self, $c) = @_; - my @messages; - my $id = $c->request->param('id'); - my $quantity = $c->request->param('quantity'); +=head2 add - if ($c->req->method eq 'POST') { - my $results; +=over - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_update'); - }; +=item Parameters: (See L<Handel::Cart/add>) - if ($results || !$DFV) { - if ($results) { - $id = $results->valid('id'); - $quantity = $results->valid('quantity'); - }; +=back - $quantity ||= 1; +Adds an item to the current cart during POST. - my $item = $c->stash->{'cart'}->items({ - id => $id - }); + [% uri %]/add/ - eval { - if ($item) { - $item->quantity($quantity); - }; - }; - if ($@) { - push @messages, $@; - }; +=cut - undef $item; - } else { - push @messages, map {$_} values %{$results->msgs}; - }; +sub add : Local { + my ($self, $c) = @_; + + if ($c->req->method eq 'POST') { + my $cart = $c->forward('create'); + $cart->add($c->req->params); }; - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; - $c->stash->{'messages'} = \@messages; - } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); - }; + $c->res->redirect($c->uri_for('[% uri %]/')); }; +=head2 clear + +Clears all items form the current shopping cart during POST. + + [% uri %]/clear/ + +=cut + sub clear : Local { my ($self, $c) = @_; - my @messages; if ($c->req->method eq 'POST') { - eval { - $c->stash->{'cart'}->clear; - }; - if ($@) { - push @messages, $@; + if (my $cart = $c->forward('load')) { + $cart->clear; }; }; - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; - $c->stash->{'messages'} = \@messages; + $c->res->redirect($c->uri_for('[% uri %]/')); +}; + +=head2 create + +Creats a new temporary shopping cart or returns the existing cart, creating a +new session shopper id if necessary. + + my $cart = $c->forward('create'); + +=cut + +sub create : Private { + my ($self, $c) = @_; + + if (!$c->session->{'shopper'}) { + $c->session->{'shopper'} = $c->model('[% model %]')->storage->new_uuid; + }; + + if (my $cart = $c->forward('load')) { + return $cart; } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); + return $c->model('[% model %]')->create({ + shopper => $c->session->{'shopper'}, + type => CART_TYPE_TEMP + }); }; + + return; }; +=head2 delete + +=over + +=item Parameters: id + +=back + +Deletes an item from the current shopping cart during a POST. + + [% uri %]/delete/ + +=cut + sub delete : Local { my ($self, $c) = @_; - my @messages; - my $id = $c->request->param('id'); if ($c->req->method eq 'POST') { - my $results; + if ($c->forward('validate')) { + if (my $cart = $c->forward('load')) { + $cart->delete({ + id => $c->req->params->{'id'} + }); - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_delete'); + $c->res->redirect($c->uri_for('[% uri %]/')); + }; + } else { + $c->forward('default'); }; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); + }; - if ($results || !$DFV) { - if ($results) { - $id = $results->valid('id'); - }; + return; +}; - eval { - $c->stash->{'cart'}->delete({ - id => $id - }); - }; - if ($@) { - push @messages, $@; +=head2 destroy + +=over + +=item Parameters: id + +=back + +Deletes the specified saved cart and all of its items during a POST. + + [% uri %]/destroy/ + +=cut + +sub destroy : Local { + my ($self, $c) = @_; + + if ($c->req->method eq 'POST') { + if ($c->forward('validate')) { + my $cart = $c->model('[% model %]')->search({ + id => $c->req->params->{'id'}, + shopper => $c->session->{'shopper'}, + type => CART_TYPE_SAVED + })->first; + + if ($cart) { + $cart->destroy; + } else { + warn "not cart"; }; + + $c->res->redirect($c->uri_for('[% uri %]/list/')); } else { - push @messages, map {$_} values %{$results->msgs}; + $c->forward('list'); }; - }; - - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; - $c->stash->{'messages'} = \@messages; } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); + $c->res->redirect($c->uri_for('[% uri %]/')); }; + + return; }; -sub empty : Local { - my ($self, $c) = @_; +=head2 list - $c->forward('clear'); -}; +Displays a list of the current shoppers saved carts/wishlists. + + [% uri %]/list/ + +=cut sub list : Local { my ($self, $c) = @_; - my @messages; + $c->stash->{'template'} = '[% action %]/list'; - eval { - $c->stash->{'carts'} = $c->model('[% model %]')->load({ - shopper => $c->stash->{'shopperid'}, + if ($c->sessionid && $c->session->{'shopper'}) { + my $carts = $c->model('[% model %]')->search({ + shopper => $c->session->{'shopper'}, type => CART_TYPE_SAVED - }, RETURNAS_ITERATOR); - }; - if ($@) { - push @messages, $@; + }); - $c->stash->{'messages'} = \@messages; + $c->stash->{'carts'} = $carts; }; - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/list.tt'; + return; }; -sub save : Local { - my ($self, $c) = @_; - my @messages; - my $name = $c->req->param('name'); +=head2 load - if ($c->req->method eq 'POST') { - my $results; +Loads the shoppers current cart. - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_save'); - }; + my $cart = $c->forward('load'); - if ($results || !$DFV) { - if ($results) { - $name = $results->valid('name'); - }; +=cut - eval { - $c->stash->{'cart'}->name($name); - $c->stash->{'cart'}->save; - }; - if ($@) { - push @messages, $@; - }; +sub load : Private { + my ($self, $c) = @_; - } else { - push @messages, map {$_} values %{$results->msgs}; - }; + if ($c->sessionid && $c->session->{'shopper'}) { + return $c->model('[% model %]')->search({ + shopper => $c->session->{'shopper'}, + type => CART_TYPE_TEMP + })->first; }; - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; - $c->stash->{'messages'} = \@messages; - } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); - }; + return; }; +=head2 restore + +=over + +=item Parameters: id + +=back + +Restores a saved shopping cart into the shoppers current cart during a POST. + + [% uri %]/restore/ + +=cut + sub restore : Local { my ($self, $c) = @_; - my @messages; - my $id = $c->req->param('id'); - my $mode = $c->req->param('mode') || CART_MODE_APPEND; if ($c->req->method eq 'POST') { - my $results; - - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_restore'); + if ($c->forward('validate')) { + if (my $cart = $c->forward('create')) { + $cart->restore({ + id => $c->req->param('id'), + shopper => $c->session->{'shopper'}, + type => CART_TYPE_SAVED + }, $c->req->param('mode') || CART_MODE_APPEND); + + $c->res->redirect($c->uri_for('[% uri %]/')); + }; + } else { + $c->forward('list'); }; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); + }; - if ($results || !$DFV) { - if ($results) { - $id = $results->valid('id'); - $mode = $results->valid('mode'); - }; + return; +}; - eval { - $c->stash->{'cart'}->restore({id => $id}, $mode); - }; - if ($@) { - push @messages, $@; - }; +=head2 save + +=over + +=item Parameters: name + +=back - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); +Saves the current cart with the name specified. + + [% uri %]/save/ + +=cut + +sub save : Local { + my ($self, $c) = @_; + + if ($c->req->method eq 'POST') { + if ($c->forward('validate')) { + if (my $cart = $c->forward('load')) { + $cart->name($c->req->param('name') || 'My Cart'); + $cart->save; + + $c->res->redirect($c->uri_for('[% uri %]/list/')); + }; } else { - push @messages, map {$_} values %{$results->msgs}; + $c->forward('default'); }; - }; - - if (scalar @messages) { - $c->stash->{'messages'} = \@messages; - $c->forward('list'); } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/'); + $c->res->redirect($c->uri_for('[% uri %]/')); }; + + return; }; -sub destroy : Local { +=head2 update + +=over + +=item Parameters: quantity + +=back + +Updates the specified cart item qith the quantity given. + + [% uri %]/update/ + +=cut + +sub update : Local { my ($self, $c) = @_; - my @messages; - my $id = $c->req->param('id'); if ($c->req->method eq 'POST') { - my $results; + if ($c->forward('validate')) { + if (my $cart = $c->forward('load')) { + my $item = $cart->items({ + id => $c->req->param('id') + })->first; - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'cart_destroy'); - }; - - if ($results || !$DFV) { - if ($results) { - $id = $results->valid('id'); - }; + if ($item) { + $item->quantity($c->req->param('quantity')); + }; - eval { - $c->model('[% model %]')->destroy({ - id => $id - }); - }; - if ($@) { - push @messages, $@; + $c->res->redirect($c->uri_for('[% uri %]/')); }; } else { - push @messages, map {$_} values %{$results->msgs}; + $c->forward('default'); }; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); + }; + + return; +}; + +=head2 validate + +Validates the current form parameters using the profile in profiles.yml that +matches the current action. + + if ($c->forward('validate')) { + }; - if (scalar @messages) { - $c->stash->{'messages'} = \@messages; - $c->forward('list'); +=cut + +sub validate : Private { + my ($self, $c) = @_; + + $self->{'validator'}->results->clear; + + my $results = $self->{'validator'}->check( + $c->req, + $self->{'profiles'}->{$c->action} + ); + + if ($results->success) { + return $results; } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/list/'); + $c->stash->{'errors'} = $results->messages($c->action); }; + + return; }; +=head1 AUTHOR + +A clever guy + +=head1 LICENSE + +This library is free software, you can redistribute it and/or modify +it under the same terms as Perl itself. + +=cut + 1; __test__ -use Test::More tests => 2; +use Test::More tests => 3; use strict; use warnings; use_ok('Catalyst::Test', '[% app %]'); use_ok('[% class %]'); -__view__ -[% TAGS [- -] %] + +ok(request('[% uri %]')->is_success, 'Request should succeed'); +__default__ +[% TAGS [- -] -%] [% USE HTML %] <h1>Your Shopping Cart</h1> -<p> - <a href="[% base _ '[- uri.replace('^/', '') -]/' %]">View Cart</a> | - <a href="[% base _ '[- uri.replace('^/', '') -]/list/' %]">View Saved Carts</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] -[% IF cart.count %] +[% INCLUDE [- action -]/errors %] +[% IF items.count %] <table border="0" cellpadding="3" cellspacing="5"> <tr> <th align="left">SKU</th> @@ -602,9 +550,9 @@ __view__ <th align="right">Total</th> <th colspan="2"></th> </tr> - [% FOREACH item = cart.items %] + [% WHILE (item = items.next) %] <tr> - <form action="[% base _ '[- uri.replace('^/', '') -]/update/' %]" method="post"> + <form action="[% c.uri_for('[- uri -]/update/') %]" method="post"> <input type="hidden" name="id" value="[% HTML.escape(item.id) %]"> <td align="left">[% HTML.escape(item.sku) %]</td> <td align="left">[% HTML.escape(item.description) %]</td> @@ -613,14 +561,14 @@ __view__ <td align="right">[% HTML.escape(item.total.format(undef, 'FMT_SYMBOL')) %]</td> <td><input type="submit" value="Update"></td> </form> - <form action="[% base _ '[- uri.replace('^/', '') -]/delete/' %]" method="post"> + <form action="[% c.uri_for('[- uri -]/delete/') %]" method="POST"> <input type="hidden" name="id" value="[% HTML.escape(item.id) %]"> <td> <input type="submit" value="Delete"> </td> </form> </tr> - [% END %] + [% END %] <tr> <td colspan="7" height="20"></td> </tr> @@ -631,16 +579,16 @@ __view__ </tr> <tr> <td colspan="7" align="right"> - <form action="[% base _ '[- uri.replace('^/', '') -]/empty/' %]" method="post"> + <form action="[% c.uri_for('[- uri -]/clear/') %]" method="POST"> <input type="submit" value="Empty Cart"> </form> - <form action="[% base _ '[- couri.replace('^/', '') -]/' %]" method="get"> + <form action="[% c.uri_for('/[- couri -]/') %]" method="POST"> <input type="submit" value="Checkout"> </form> </td> </tr> </table> - <form action="[% base _ '[- uri.replace('^/', '') -]/save/' %]" method="post"> + <form action="[% c.uri_for('[- uri -]/save/') %]" method="POST"> <input type="text" name="name"> <input type="submit" value="Save Cart"> </form> @@ -648,20 +596,10 @@ __view__ <p>Your shopping cart is empty.</p> [% END %] __list__ -[% TAGS [- -] %] +[% TAGS [- -] -%] [% USE HTML %] <h1>Your Saved Shopping Carts</h1> -<p> - <a href="[% base _ '[- uri.replace('^/', '') -]/' %]">View Cart</a> | - <a href="[% base _ '[- uri.replace('^/', '') -]/list/' %]">View Saved Carts</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] +[% INCLUDE [- action -]/errors %] [% IF carts.count %] <table border="0" cellpadding="3" cellspacing="5"> <tr> @@ -673,7 +611,7 @@ __list__ <tr> <td align="left" valign="top">[% HTML.escape(cart.name) %]</td> <td> - <form action="[% base _ '[- uri.replace('^/', '') -]/restore/' %]" method="POST"> + <form action="[% c.uri_for('[- uri -]/restore/') %]" method="POST"> <input type="hidden" name="id" value="[% HTML.escape(cart.id) %]"> <select name="mode"> [% USE hc = Handel.Constants %] @@ -685,7 +623,7 @@ __list__ </form> </td> <td> - <form action="[% base _ '[- uri.replace('^/', '') -]/destroy/' %]" method="POST"> + <form action="[% c.uri_for('[- uri -]/destroy/') %]" method="POST"> <input type="hidden" name="id" value="[% HTML.escape(cart.id) %]"> <input type="submit" value="Delete"> </form> @@ -696,60 +634,117 @@ __list__ [% ELSE %] <p>You have no saved shopping carts.</p> [% END %] +__errors__ +[% TAGS [- -] -%] +[% IF errors %] + <ul class="errors"> + [% FOREACH error IN errors %] + <li>[% HTML.escape(error) %]</li> + [% END %] + </ul> +[% END %] +__messages__ +[% action %]/save: + name: + NOT_BLANK: The name field cannot be empty. + LENGTH: The name field must be between 1 and 50 characters. +[% action %]/update: + id: + REGEX: The id field is in the wrong format. + quantity: + NOT_BLANK: The quantity field cannot be empty. + UINT: The quantity field must be a positive number. +[% action %]/delete: + id: + REGEX: The id field is in the wrong format. +[% action %]/destroy: + id: + REGEX: The id field is in the wrong format. +[% action %]/restore: + id: + REGEX: The id field is in the wrong format. + mode: + BETWEEN: The mode field must be between 1 and 3. +__profiles__ +[% action %]/save: + - name + - [ [NOT_BLANK], [LENGTH, 1, 50] ] +[% action %]/delete: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i +[% action %]/destroy: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i +[% action %]/update: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i + - quantity + - [ [NOT_BLANK], [UINT] ] +[% action %]/restore: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i + - mode + - [ [BETWEEN, 1, 3] ] +__products__ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Nifty New Products</title> + <base href="http://localhost:3000/" /> + </head> + <body> + <h1>Nifty New Products</h1> + <p> + <a href="[% uri %]/">View Cart</a> | + </p> + <h2>Mendlefarg 3000</h2> + <p> + It slices. It dices. It MVCs! + </p> + <form action="[% uri %]/add/" method="POST"> + <p> + <input type="hidden" name="sku" value="MFG3000" /> + <input type="hidden" name="description" value="Mendlefarg 3000" /> + <input type="hidden" name="price" value="19.95" /> + <input type="text" name="quantity" value="1" size="3" /> + <input type="submit" value="Add To Cart" /> + </p> + </form> + + <h2>Flimblebot 98</h2> + <p> + The most advanced flimble-based bot response software ever! + </p> + <form action="[% uri %]/add/" method="POST"> + <p> + <input type="hidden" name="sku" value="FB98" /> + <input type="hidden" name="description" value="Flimblebot 98 Single-User" /> + <input type="hidden" name="price" value="12.34" /> + <input type="text" name="quantity" value="1" size="3" /> + <input type="submit" value="Add To Cart" /> + </p> + </form> + </body> +</html> __END__ - -=head1 NAME - -Catalyst::Helper::Controller::Handel::Cart - Helper for Handel::Cart Controllers - -=head1 SYNOPSIS - - script/create.pl controller <newclass> Handel::Cart [<modelclass> <checkoutcontroller>] - script/create.pl controller Cart Handel::Cart Cart Checkout - -=head1 DESCRIPTION - -A Helper for creating controllers based on Handel::Cart objects. If no modelclass -is specified, ::M::Cart is assumed. - -Both the modelclass and checkoutcontroller arguments try to do the right thing with the -names given to them. - -For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully -qualified package name: - - MyApp::M::CartModel - MyApp::Model::CartModel - CartModel - -In all three cases everything before M{odel)|C(ontroller) will be stripped and the class CartModel -will be used. - -By default, the code generated by this helper requires Data::FormValidator 4.00 or greater -to be installed for it's form validation. If you don't want to install Data::FormValidator, -simply comment out this line in the generated controller class: - - use Data::FormValidator 4.00; - -The code is designed to work without Data::FormValidator 4.00 installed. - -=head1 METHODS - -=head2 mk_compclass - -Makes a Handel::Cart Controller class and template files for you. - -=head2 mk_comptest - -Makes a Handel::Cart Controller test for you. - -=head1 SEE ALSO - -L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Cart> - -=head1 AUTHOR - - Christopher H. Laco - CPAN ID: CLACO - claco@chrislaco.com - http://today.icantfocus.com/blog/ lib/Catalyst/Helper/Controller/Handel/Cart.pm @@ -1,9 +1,52 @@ # $Id$ +## no critic (ProhibitCaptureWithoutTest) package Catalyst::Helper::Controller::Handel::Checkout; use strict; use warnings; -use Path::Class; -use Catalyst 5.56; + +BEGIN { + use Catalyst 5.7001; + use Catalyst::Utils; + use Path::Class; +}; + +=head1 NAME + +Catalyst::Helper::Controller::Handel::Checkout - Helper for Handel::Checkout Controllers + +=head1 SYNOPSIS + + script/create.pl controller <newclass> Handel::Checkout [<cartmodel> <ordermodel> <cartcontroller> <ordercontroller>] + script/create.pl controller Checkout Handel::Checkout + +=head1 DESCRIPTION + +A Helper for creating controllers based on Handel::Checkout objects. IF no cartmodel or +ordermodel was specified, ::M::Cart and ::M::Orders is assumed. + +The cartmode, ordermodel, cartcontroller and ordercontroller arguments try to do the +right thing with the names given to them. + +For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully +qualified package name: + + MyApp::M::CartModel + MyApp::Model::CartModel + CartModel + +In all three cases everything before M{odel)|C(ontroller) will be stripped and the class CartModel +will be used. + +B<The code generated by this helper requires FormValidator::Simple, HTML::FIllInForm and YAML to be +installed to operate.> + +=head1 METHODS + +=head2 mk_compclass + +Makes a Handel::Checkout Controller class and template files for you. + +=cut sub mk_compclass { my ($self, $helper, $cmodel, $omodel, $ccontroller, $ocontroller) = @_; @@ -11,474 +54,400 @@ sub mk_compclass { my $dir = dir($helper->{'base'}, 'root', $helper->{'uri'}); $cmodel ||= 'Cart'; - $omodel ||= 'Orders'; + $omodel ||= 'Order'; $ccontroller ||= 'Cart'; - $ocontroller ||= 'Orders'; + $ocontroller ||= 'Order'; + + $ccontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i; + $ccontroller = $3 ? $3 : 'Cart'; + $helper->{'ccontroller'} = $ccontroller; + + $ocontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i; + $ocontroller = $3 ? $3 : 'Order'; + $helper->{'ocontroller'} = $ocontroller; - $cmodel = $cmodel =~ /^(.*::M(odel)?::)?(.*)$/i ? $3 : 'Cart'; + $cmodel =~ /^(.*::M(odel)?::)?(.*)$/i; + $cmodel = $3 ? $3 : 'Cart'; $helper->{'cmodel'} = $cmodel; - $omodel = $omodel =~ /^(.*::M(odel)?::)?(.*)$/i ? $3 : 'Orders'; + $omodel =~ /^(.*::M(odel)?::)?(.*)$/i; + $omodel = $3 ? $3 : 'Order'; $helper->{'omodel'} = $omodel; - my $curi = $ccontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i ? lc($3) : 'cart'; + #$ccontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i; + my $curi = $ccontroller; $curi =~ s/::/\//g; $helper->{'curi'} = $curi; - my $ouri = $ocontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i ? lc($3) : 'orders'; + #$ocontroller =~ /^(.*::C(ontroller)?::)?(.*)$/i; + my $ouri = $ocontroller; $ouri =~ s/::/\//g; $helper->{'ouri'} = $ouri; + $helper->{'action'} = Catalyst::Utils::class2prefix($helper->{'class'}); + $helper->mk_dir($dir); $helper->render_file('controller', $file); - $helper->render_file('edit', file($dir, 'edit.tt')); - $helper->render_file('preview', file($dir, 'preview.tt')); - $helper->render_file('payment', file($dir, 'payment.tt')); - $helper->render_file('complete', file($dir, 'complete.tt')); + + $helper->render_file('default', file($dir, 'default')); + $helper->render_file('billing', file($dir, 'billing')); + $helper->render_file('billing', file($dir, 'billing')); + $helper->render_file('preview', file($dir, 'preview')); + $helper->render_file('payment', file($dir, 'payment')); + $helper->render_file('complete', file($dir, 'complete')); + + $helper->render_file('errors', file($dir, 'errors')); + $helper->render_file('profiles', file($dir, 'profiles.yml')); + $helper->render_file('messages', file($dir, 'messages.yml')); + + return 1; }; +=head2 mk_comptest + +Makes a Handel::Checkout Controller test for you. + +=cut + sub mk_comptest { my ($self, $helper) = @_; my $test = $helper->{'test'}; $helper->render_file('test', $test); + + return 1; }; +=head1 SEE ALSO + +L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Checkout> + +=head1 AUTHOR + + Christopher H. Laco + CPAN ID: CLACO + claco@chrislaco.com + http://today.icantfocus.com/blog/ + +=cut + 1; __DATA__ + +=begin pod_to_ignore + __controller__ package [% class %]; use strict; use warnings; -use Handel::Checkout; -use Handel::Constants qw(:returnas :order :cart :checkout); -use Data::FormValidator 4.00; -use HTML::FillInForm 1.04; -use base 'Catalyst::Base'; - -our $DFV; -our $FIF; - -# Until this patch [hopefully] get's dumped into DFV 4.03, I've inlined the msgs -# method below with the following path applied to it: -# -#--- Results.pm.orig Wed Aug 31 22:27:27 2005 -#+++ Results.pm Wed Sep 14 17:40:28 2005 -#@@ -584,7 +584,9 @@ -# if ($self->has_missing) { -# my $missing = $self->missing; -# for my $m (@$missing) { -#- $msgs{$m} = _error_msg_fmt($profile{format},$profile{missing}); -#+ $msgs{$m} = _error_msg_fmt($profile{format}, -#+ (ref $profile{missing} eq 'HASH' ? -#+ ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); -# } -# } BEGIN { - eval 'use HTML::FillInForm 1.04'; - if (!$@) { - $FIF = HTML::FillInForm->new; - }; + use base qw/Catalyst::Controller/; + use Handel::Checkout; + use Handel::Constants qw/:cart :order :checkout/; + use FormValidator::Simple 0.17; + use HTML::FillInForm; + use YAML; +}; - eval 'use Data::FormValidator 4.00'; - if (!$@) { - ############################################################# - # This is here until the patch makes it to release - ############################################################# - no warnings 'redefine'; - sub Data::FormValidator::Results::msgs { - my $self = shift; - my $controls = shift || {}; - if (defined $controls and ref $controls ne 'HASH') { - die "$0: parameter passed to msgs must be a hash ref"; - } - - - # Allow msgs to be called more than one to accumulate error messages - $self->{msgs} ||= {}; - $self->{profile}{msgs} ||= {}; - $self->{msgs} = { %{ $self->{msgs} }, %$controls }; - - # Legacy typo support. - for my $href ($self->{msgs}, $self->{profile}{msgs}) { - if ( - (not defined $href->{invalid_separator}) - && (defined $href->{invalid_seperator}) - ) { - $href->{invalid_separator} = $href->{invalid_seperator}; - } - } - - my %profile = ( - prefix => '', - missing => 'Missing', - invalid => 'Invalid', - invalid_separator => ' ', - - format => '<span style="color:red;font-weight:bold"><span class="dfv_errors">* %s</span></span>', - %{ $self->{msgs} }, - %{ $self->{profile}{msgs} }, - ); +=head1 NAME + +[% class %] - Catalyst Controller + +=head1 DESCRIPTION + +Catalyst Controller. + +=head1 METHODS + +=head2 COMPONENT + +=cut + +sub COMPONENT { + my $self = shift->NEXT::COMPONENT(@_); + + $self->{'validator'} = FormValidator::Simple->new; + $self->{'validator'}->set_messages( + $_[0]->path_to('root', '[% action %]', 'messages.yml') + ); + + $self->{'fif'} = HTML::FillInForm->new; + + $self->{'profiles'} = YAML::LoadFile($_[0]->path_to('root', '[% action %]', 'profiles.yml')); + return $self; +}; + +=head2 default + +Default action when browsing to [% uri %]/ that loads the checkout process for +the current shopper. If no session exists, or the shopper id isn't set, or there +os no temporary order record, nothing will be loaded. This keeps non-shoppers +like Google and others from wasting sessions and order records for no good +reason. + +=cut - my %msgs = (); - - # Add invalid messages to hash - # look at all the constraints, look up their messages (or provide a default) - # add field + formatted constraint message to hash - if ($self->has_invalid) { - my $invalid = $self->invalid; - for my $i ( keys %$invalid ) { - $msgs{$i} = join $profile{invalid_separator}, map { - Data::FormValidator::Results::_error_msg_fmt($profile{format},($profile{constraints}{$_} || $profile{invalid})) - } @{ $invalid->{$i} }; - } - } - - # Add missing messages, if any - if ($self->has_missing) { - my $missing = $self->missing; - for my $m (@$missing) { - $msgs{$m} = Data::FormValidator::Results::_error_msg_fmt($profile{format}, - (ref $profile{missing} eq 'HASH' ? - ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); - } - } - - my $msgs_ref = Data::FormValidator::Results::prefix_hash($profile{prefix},\%msgs); - - $msgs_ref->{ $profile{any_errors} } = 1 if defined $profile{any_errors}; - - return $msgs_ref; - } - ############################################################# - - $DFV = Data::FormValidator->new({ - checkout_update => { - required => [qw/billtofirstname - billtolastname - billtoaddress1 - billtocity - billtostate - billtozip - billtocountry - billtoemail - shiptofirstname - shiptolastname - shiptoaddress1 - shiptocity - shiptostate - shiptozip - shiptocountry - shiptoemail/], - field_filters => { - billtofirstname => ['trim'], - billtolastname => ['trim'], - billtoaddress1 => ['trim'], - billtocity => ['trim'], - billtostate => ['trim'], - billtozip => ['trim'], - billtocountry => ['trim'], - billtoemail => ['trim'], - shiptofirstname => ['trim'], - shiptolastname => ['trim'], - shiptoaddress1 => ['trim'], - shiptocity => ['trim'], - shiptostate => ['trim'], - shiptozip => ['trim'], - shiptocountry => ['trim'], - shiptoemail => ['trim'], - }, - msgs => { - missing => { - default => 'Field is blank!', - billtofirstname => 'The bill to first name field is required', - billtolastname => 'The bill to last name field is required', - billtoaddress1 => 'The bill to address line 1 field is required', - billtocity => 'The bill to city field is required', - billtostate => 'The bill to state field is required', - billtozip => 'The bill to zip field is required', - billtocountry => 'The bill to country field is required', - billtoemail => 'The bill to email field is required', - shiptofirstname => 'The ship to first name field is required', - shiptolastname => 'The ship to last name field is required', - shiptoaddress1 => 'The ship to address line field is required', - shiptocity => 'The ship to city field is required', - shiptostate => 'The ship to state field is required', - shiptozip => 'The ship to zip field is required', - shiptocountry => 'The ship to country field is required', - shiptoemail => 'The ship to email field is required', - }, - format => '%s' - } - }, - checkout_payment => { - required => [qw/ccname cctype ccn ccm ccy/], - field_filters => { - ccname => ['trim'], - cctype => ['trim'], - ccn => ['trim'], - ccm => ['digit'], - ccy => ['digit'], - ccvn => ['digit'], - }, - msgs => { - missing => { - default => 'Field is blank!', - ccname => 'The credit card name field is required', - cctype => 'The credit card type field is required', - ccn => 'The credit card number is required', - ccm => 'The credit card expiration month field is required', - ccy => 'The credit card expiration year is required', - ccvn => 'THe credit card verification number is required' - }, - format => '%s' - } - } - }); +sub default : Private { + my ($self, $c) = @_; + $c->stash->{'template'} = '[% action %]/default'; + + if ($c->forward('load')) { + $c->res->redirect($c->uri_for('[% uri %]/billing/')); }; + + return; }; -sub begin : Private { +=head2 billing + +Loads/saves the billing and shipping information during GET/POST. + + [% uri %]/billing/ + +=cut + +sub billing : Local { my ($self, $c) = @_; - my $shopperid = $c->req->cookie('shopperid'); + $c->stash->{'template'} = '[% action %]/billing'; - if (!$shopperid || !$shopperid->value) { - $c->res->redirect($c->req->base . '[% curi %]/'); - } else { - $shopperid = $shopperid->value; - - $c->stash->{'shopperid'} = $shopperid; - - my $cart = $c->model('[% cmodel %]')->load({ - shopper => $shopperid, - type => CART_TYPE_TEMP - }, RETURNAS_ITERATOR)->first; - - if (!$cart || !$cart->count) { - $c->res->redirect($c->req->base . '[% curi %]/'); - } else { - my $order = $c->model('[% omodel %]')->load({ - shopper => $shopperid, - type => ORDER_TYPE_TEMP - }, RETURNAS_ITERATOR)->first; - - if (!$order) { - $order = $c->model('[% omodel %]')->new({ - shopper => $shopperid, - cart => $cart - }); + if (my $order = $c->forward('load')) { + $c->stash->{'order'} = $order; + if ($c->req->method eq 'POST') { + if ($c->forward('validate')) { my $checkout = Handel::Checkout->new({ - order => $order, - phases => 'CHECKOUT_PHASE_INITIALIZE' + order => $order, + phases => 'CHECKOUT_PHASE_VALIDATE' }); - $c->stash->{'order'} = $checkout->order; - if ($checkout->process == CHECKOUT_STATUS_OK) { - + if ($checkout->order->update($c->req->params)) { + $c->res->redirect($c->uri_for('[% uri %]/preview/')); + }; } else { - $c->stash->{'messages'} = $checkout->messages; + $c->stash->{'errors'} = $checkout->messages; }; - } else { - $order->reconcile($cart); - $c->stash->{'order'} = $order; }; }; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); }; -}; - -sub end : Private { - my ($self, $c) = @_; - $c->forward($c->view('TT')) - unless ( $c->res->output || $c->res->body || ! $c->stash->{template} ); - - if ($c->req->method eq 'POST' && $c->stash->{'messages'} && $FIF) { - ## Merge (erase) DFV Missing/Invalid fields from params before formfill - my %missing = (); - my %invalid = (); - my $results = $c->stash->{'_dfv_results'}; - if (ref $results) { - %missing = map {$_ => ''} ($results->missing); - %invalid = map {$_ => ''} ($results->invalid); - }; - - my %parameters = (%{$c->req->parameters}, %missing, %invalid); - - $c->res->output( - $FIF->fill( - scalarref => \$c->response->{body}, - fdat => \%parameters - ) - ); - }; + return; }; -sub default : Local { - my ($self, $c) = @_; +=head2 load - $c->forward('edit'); -}; +Loads the current temporary order for the current shopper. -sub edit : Local { - my ($self, $c) = @_; + my $order = $c->forward('load'); - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/edit.tt'; -}; +=cut -sub update : Local { +sub load : Private { my ($self, $c) = @_; - my @messages; - if ($c->req->method eq 'POST') { - my $results; - - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'checkout_update'); - }; - - if ($results || !$DFV) { - eval { - my $order = $c->stash->{'order'}; - if (!$order) { - $c->res->redirect($c->req->base . '[% curi %]/'); - } else { - foreach my $param ($c->req->param) { - $order->autoupdate(0); - if ($order->can($param)) { - if (($order->$param || '') ne ($c->req->param($param || ''))) { - $order->$param($c->req->param($param)); - }; - }; - $order->autoupdate(1); - $order->update; - }; + if ($c->sessionid && $c->session->{'shopper'}) { + if (my $order = $c->forward($c->controller('[% ocontroller %]'), 'load')) { + $order->reconcile( + $c->forward($c->controller('[% ccontroller %]'), 'load') + ); + return $order; + } elsif (my $cart = $c->forward($c->controller('[% ccontroller %]'), 'load')) { + if ($cart->count) { + if (my $order = $c->forward($c->controller('[% ocontroller %]'), 'create', [$cart])) { + my $checkout = Handel::Checkout->new({ - order => $order, - phases => 'CHECKOUT_PHASE_VALIDATE' + order => $order, + phases => 'CHECKOUT_PHASE_INITIALIZE' }); - if ($checkout->process == CHECKOUT_STATUS_OK) { - - } else { - push @messages, 'Failed to update your bill to/ship to address!'; - push @messages, @{$checkout->messages}; - }; + if ($checkout->process != CHECKOUT_STATUS_OK) { + $c->stash->{'errors'} = $checkout->messages; + }; + + return $checkout->order; }; }; - if ($@) { - push @messages, $@; - }; - } else { - $c->stash->{'_dfv_results'} = $results; - push @messages, map {$_} values %{$results->msgs}; - }; - if (scalar @messages) { - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/edit.tt'; - $c->stash->{'messages'} = \@messages; - } else { - $c->res->redirect($c->req->base . '[% uri.replace('^/', '') %]/preview/'); }; }; -}; - -sub preview : Local { - my ($self, $c) = @_; - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/preview.tt'; + return; }; -sub payment : Local { - my ($self, $c) = @_; - my @messages; +=head2 payment - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/payment.tt'; +Loads/Saves the payment information during GET/POST. - if ($c->req->method eq 'POST') { - my $results; + [% uri %]/payment/ - if ($DFV) { - $results = $DFV->check($c->req->parameters, 'checkout_payment'); - }; +=cut - if ($results || !$DFV) { - eval { - my $order = $c->stash->{'order'}; - if (!$order) { - $c->res->redirect($c->req->base . '[% curi %]/'); - } else { - foreach my $param ($c->req->param) { - if ($order->can($param)) { - if (($order->$param || '') ne ($c->req->param($param || ''))) { - $order->$param($c->req->param($param)); - }; - }; - }; +sub payment : Local { + my ($self, $c) = @_; + $c->stash->{'template'} = '[% action %]/payment'; - my $checkout = Handel::Checkout->new({ - order => $order, - phases => 'CHECKOUT_PHASE_AUTHORIZE, CHECKOUT_PHASE_FINALIZE, CHECKOUT_PHASE_DELIVERY' - }); + if (my $order = $c->forward('load')) { + $c->stash->{'order'} = $order; + + if ($c->req->method eq 'POST') { + if ($c->forward('validate')) { + my $checkout = Handel::Checkout->new({ + order => $order, + phases => 'CHECKOUT_PHASE_AUTHORIZE, CHECKOUT_PHASE_FINALIZE, CHECKOUT_PHASE_DELIVER' + }); - if ($checkout->process == CHECKOUT_STATUS_OK) { + if ($checkout->process == CHECKOUT_STATUS_OK) { + if ($checkout->order->update) { eval { $c->model('[% cmodel %]')->destroy({ - shopper => $c->stash->{'shopperid'}, - type => CART_TYPE_TEMP + shopper => $c->session->{'shopper'}, + type => CART_TYPE_TEMP }); }; + $c->stash->{'order'} = $checkout->order; $c->forward('complete'); - } else { - push @messages, @{$checkout->messages}; }; + } else { + $c->stash->{'errors'} = $checkout->messages; }; }; - if ($@) { - push @messages, $@; - }; - } else { - $c->stash->{'_dfv_results'} = $results; - push @messages, map {$_} values %{$results->msgs}; }; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); }; - if (scalar @messages) { - $c->stash->{'messages'} = \@messages; + + return; +}; + +=head2 preview + +Displays a preview of the current order. + + [% uri %]/preview/ + +=cut + +sub preview : Local { + my ($self, $c) = @_; + $c->stash->{'template'} = '[% action %]/preview'; + + if (my $order = $c->forward('load')) { + $c->stash->{'order'} = $order; + } else { + $c->res->redirect($c->uri_for('[% uri %]/')); }; + + return; }; +=head2 complete + +Displays the order complete page. + +=cut + sub complete : Local { my ($self, $c) = @_; + $c->stash->{'template'} = '[% action %]/complete'; + + if (!$c->stash->{'order'}) { + $c->res->redirect($c->uri_for('[% uri %]/')); + }; +}; + +=head2 render + +Local render method to attach the load end method and HTML::FIllInForm to. + +=cut + +sub render : ActionClass('RenderView') {}; + +=head2 end + +Runs HTML::FillInForm on the curret request before sending the output to the +browser. + +=cut + +sub end : Private { + my ($self, $c) = @_; + $c->forward('render'); + + if ($c->req->method eq 'POST') { + $c->res->output( + $self->{'fif'}->fill( + scalarref => \$c->response->{body}, + fdat => $c->req->params + ) + ); + }; +}; + +=head2 validate + +Validates the current form parameters using the profile in profiles.yml that +matches the current action. + + if ($c->forward('validate')) { + + }; + +=cut + +sub validate : Private { + my ($self, $c) = @_; + + $self->{'validator'}->results->clear; + + my $results = $self->{'validator'}->check( + $c->req, + $self->{'profiles'}->{$c->action} + ); + + if ($results->success) { + return $results; + } else { + $c->stash->{'errors'} = $results->messages($c->action); + }; - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/complete.tt'; + return; }; +=head1 AUTHOR + +A clever guy + +=head1 LICENSE + +This library is free software, you can redistribute it and/or modify +it under the same terms as Perl itself. + +=cut + 1; __test__ -use Test::More tests => 2; +use Test::More tests => 3; use strict; use warnings; use_ok('Catalyst::Test', '[% app %]'); use_ok('[% class %]'); -__edit__ -[% TAGS [- -] %] + +ok(request('[% uri %]')->is_success, 'Request should succeed'); +__default__ +<h1>Checkout</h1> +<p>Your shopping cart is empty.</p> +__billing__ +[% TAGS [- -] -%] [% USE HTML %] <h1>Billing/Shipping Information</h1> -<p> - <a href="[% base _ '[- curi.replace('^/', '') -]/' %]">View Cart</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] -<form action="[% base _ '[- uri.replace('^/', '') -]/update/' %]" method="post"> +[% INCLUDE [- action -]/errors %] +<form action="[% c.uri_for('[- uri -]/billing/') %]" method="POST"> <table border="0" cellpadding="3" cellspacing="5"> <tr> <th colspan="2" align="left">Billing</th> @@ -600,20 +569,9 @@ __edit__ </table> </form> __preview__ -[% TAGS [- -] %] +[% TAGS [- -] -%] [% USE HTML %] <h1>Order Preview</h1> -<p> - <a href="[% base _ '[- curi.replace('^/', '') -]/' %]">View Cart</a> | - <a href="[% base _ '[- uri.replace('^/', '') -]/edit/' %]">Edit Billing/Shipping</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] <table border="0" cellpadding="3" cellspacing="5"> <tr> <th colspan="2" align="left">Billing</th> @@ -771,7 +729,7 @@ __preview__ </tr> <tr> <td colspan="5" align="right"> - <form action="[% base _ '[- uri.replace('^/', '') -]/payment/' %]" method="get"> + <form action="[% c.uri_for('[- uri -]/payment/') %]" method="GET"> <input type="submit" value="Continue"> </form> </td> @@ -781,21 +739,11 @@ __preview__ </td> </table> __payment__ -[% TAGS [- -] %] +[% TAGS [- -] -%] [% USE HTML %] <h1>Payment Information</h1> -<p> - <a href="[% base _ '[- curi.replace('^/', '') -]/' %]">View Cart</a> | - <a href="[% base _ '[- uri.replace('^/', '') -]/preview/' %]">Preview</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] -<form action="[% base _ '[- uri.replace('^/', '') -]/payment/' %]" method="post"> +[% INCLUDE [- action -]/errors %] +<form action="[% c.uri_for('[- uri -]/payment/') %]" method="POST"> <table border="0" cellpadding="3" cellspacing="5"> <tr> <td align="right">Name On Card:</td> @@ -830,19 +778,9 @@ __payment__ </table> </form> __complete__ -[% TAGS [- -] %] +[% TAGS [- -] -%] [% USE HTML %] <h1>Order Complete!</h1> -<p> - <a href="[% base _ '[- ouri.replace('^/', '') -]/list/' %]">View Orders</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] <table border="0" cellpadding="3" cellspacing="5"> <tr> <th colspan="2" align="left">Billing</th> @@ -1012,62 +950,125 @@ __complete__ </td> </td> </table> +__errors__ +[% TAGS [- -] -%] +[% IF errors %] + <ul class="errors"> + [% FOREACH error IN errors %] + <li>[% HTML.escape(error) %]</li> + [% END %] + </ul> +[% END %] +__messages__ +[% action %]/view: + id: + REGEX: The id field is in the wrong format. +[% action %]/billing: + billtofirstname: + NOT_BLANK: The bill to first name field cannot be blank. + billtolastname: + NOT_BLANK: The bill to last name field cannot be blank. + billtoaddress1: + NOT_BLANK: The bill to address line 1 field cannot be blank. + billtocity: + NOT_BLANK: The bill to city field cannot be blank. + billtostate: + NOT_BLANK: The bill to state field cannot be blank. + billtozip: + NOT_BLANK: The bill to zip/postal code field cannot be blank. + billtocountry: + NOT_BLANK: The bill to country field cannot be blank. + billtoemail: + NOT_BLANK: The bill to email address field cannot be blank. + shiptofirstname: + NOT_BLANK: The ship to first name field cannot be blank. + shiptolastname: + NOT_BLANK: The ship to last name field cannot be blank. + shiptoaddress1: + NOT_BLANK: The ship to address line 1 field cannot be blank. + shiptocity: + NOT_BLANK: The ship to city field cannot be blank. + shiptostate: + NOT_BLANK: The ship to state field cannot be blank. + shiptozip: + NOT_BLANK: The ship to zip/postal code field cannot be blank. + shiptocountry: + NOT_BLANK: The ship to country field cannot be blank. + shiptoemail: + NOT_BLANK: The ship to email field cannot be blank. +[% action %]/payment: + ccname: + NOT_BLANK: The credit card name field is required. + cctype: + NOT_BLANK: The credit card type field is required. + ccn: + NOT_BLANK: The credit card number is required. + LENGTH: The credit card number must be between 12 to 16 digits. + UINT: The credit cart number must contain numbers only. + ccm: + NOT_BLANK: The credit card expiration month field is required. + BETWEEN: The credot card month must be between 1 and 12. + ccy: + NOT_BLANK: The credit card expiration year is required. + LENGTH: The credit card expiration year must be 2 digits long. + UINT: The credit cart expiration year must contain numbers only. + ccvn: + NOT_BLANK: The credit card verification number is required. + LENGTH: The credit card verification number must be 3 to 4 digits long. + UINT: The credit cart verification number must contain numbers only. +__profiles__ +[% action %]/view: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i +[% action %]/billing: + - billtofirstname + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - billtolastname + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - billtoaddress1 + - [ ['NOT_BLANK'], ['LENGTH', 1, 50] ] + - billtocity + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - billtostate + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - billtozip + - [ ['NOT_BLANK'], ['LENGTH', 1, 10] ] + - billtocountry + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - billtoemail + - [ ['NOT_BLANK'], ['LENGTH', 1, 50] ] + - shiptofirstname + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - shiptolastname + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - shiptoaddress1 + - [ ['NOT_BLANK'], ['LENGTH', 1, 50] ] + - shiptocity + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - shiptostate + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - shiptozip + - [ ['NOT_BLANK'], ['LENGTH', 1, 10] ] + - shiptocountry + - [ ['NOT_BLANK'], ['LENGTH', 1, 25] ] + - shiptoemail + - [ ['NOT_BLANK'], ['LENGTH', 1, 50] ] +[% action %]/payment: + - ccname + - [ ['NOT_BLANK'] ] + - cctype + - [ ['NOT_BLANK'] ] + - ccn + - [ ['NOT_BLANK'], ['LENGTH', 12, 16], ['UINT'] ] + - ccm + - [ ['NOT_BLANK'], ['BETWEEN', 1, 12] ] + - ccy + - [ ['NOT_BLANK'], ['LENGTH', 2], ['UINT'] ] + - ccvn + - [ ['NOT_BLANK'], ['LENGTH', 3, 4], ['UINT'] ] __END__ - -=head1 NAME - -Catalyst::Helper::Controller::Handel::Checkout - Helper for Handel::Checkout Controllers - -=head1 SYNOPSIS - - script/create.pl controller <newclass> Handel::Checkout [<cartmodel> <ordermodel> <cartcontroller> <ordercontroller>] - script/create.pl controller Checkout Handel::Checkout - -=head1 DESCRIPTION - -A Helper for creating controllers based on Handel::Checkout objects. IF no cartmodel or -ordermodel was specified, ::M::Cart and ::M::Orders is assumed. - -The cartmode, ordermodel, cartcontroller and ordercontroller arguments try to do the -right thing with the names given to them. - -For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully -qualified package name: - - MyApp::M::CartModel - MyApp::Model::CartModel - CartModel - -In all three cases everything before M{odel)|C(ontroller) will be stripped and the class CartModel -will be used. - -By default, the code generated by this helper requires Data::FormValidator 4.00 or greater -and HTML::FillInForm 1.04 or greater to be installed for it's form validation. If you don't -want to install Data::FormValidator or HTML::FillInForm, simply comment out this line in -the generated controller class: - - use Data::FormValidator 4.00; - use HTML::FillInForm 1.04; - -The code is designed to work without Data::FormValidator 4.00 and/or HTML::FillInForm 1.04 installed. - -=head1 METHODS - -=head2 mk_compclass - -Makes a Handel::Checkout Controller class and template files for you. - -=head2 mk_comptest - -Makes a Handel::Checkout Controller test for you. - -=head1 SEE ALSO - -L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Checkout> - -=head1 AUTHOR - - Christopher H. Laco - CPAN ID: CLACO - claco@chrislaco.com - http://today.icantfocus.com/blog/ lib/Catalyst/Helper/Controller/Handel/Checkout.pm @@ -1,245 +1,308 @@ # $Id$ +## no critic (ProhibitCaptureWithoutTest) package Catalyst::Helper::Controller::Handel::Order; use strict; use warnings; -use Path::Class; -use Catalyst 5.56; + +BEGIN { + use Catalyst 5.7001; + use Catalyst::Utils; + use Path::Class; +}; + +=head1 NAME + +Catalyst::Helper::Controller::Handel::Order - Helper for Handel::Order Controllers + +=head1 SYNOPSIS + + script/create.pl controller <newclass> Handel::Order [<modelclass>] + script/create.pl controller Orders Handel::Order OrderModel + +=head1 DESCRIPTION + +A Helper for creating controllers based on Handel::Order objects. If no modelclass +is specified, ::M::Orders is assumed. + +The modelclass argument tries to do the right thing with the names given to it. + +For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully +qualified package name: + + MyApp::M::OrderModel + MyApp::Model::OrderModel + OrderModel + +In all three cases everything before M{odel)|C(ontroller) will be stripped and the class OrderModel +will be used. + +B<The code generated by this helper requires FormValidator::Simple and YAML to be installed to operate.> + +=head1 METHODS + +=head2 mk_compclass + +Makes a Handel::Order Controller class and template files for you. + +=cut sub mk_compclass { my ($self, $helper, $model) = @_; my $file = $helper->{'file'}; my $dir = dir($helper->{'base'}, 'root', $helper->{'uri'}); - $model ||= 'Orders'; - $model = $model =~ /^(.*::M(odel)?::)?(.*)$/i ? $3 : 'Orders'; + $model ||= 'Order'; + $model =~ /^(.*::M(odel)?::)?(.*)$/i; + $model = $3 ? $3 : 'Order'; $helper->{'model'} = $model; + $helper->{'action'} = Catalyst::Utils::class2prefix($helper->{'class'}); + $helper->mk_dir($dir); $helper->render_file('controller', $file); - $helper->render_file('list', file($dir, 'list.tt')); - $helper->render_file('view', file($dir, 'view.tt')); + + $helper->render_file('default', file($dir, 'default')); + $helper->render_file('view', file($dir, 'view')); + $helper->render_file('errors', file($dir, 'errors')); + $helper->render_file('profiles', file($dir, 'profiles.yml')); + $helper->render_file('messages', file($dir, 'messages.yml')); + + return 1; }; +=head2 mk_comptest + +Makes a Handel::Order Controller test for you. + +=cut + sub mk_comptest { my ($self, $helper) = @_; my $test = $helper->{'test'}; $helper->render_file('test', $test); + + return 1; }; +=head1 SEE ALSO + +L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Order> + +=head1 AUTHOR + + Christopher H. Laco + CPAN ID: CLACO + claco@chrislaco.com + http://today.icantfocus.com/blog/ + +=cut + 1; __DATA__ + +=begin pod_to_ignore + __controller__ package [% class %]; use strict; use warnings; -use Handel::Constants qw(:returnas :order); -use Data::FormValidator 4.00; -use base 'Catalyst::Base'; - -our $DFV; - -# Until this patch [hopefully] get's dumped into DFV 4.03, I've inlined the msgs -# method below with the following path applied to it: -# -#--- Results.pm.orig Wed Aug 31 22:27:27 2005 -#+++ Results.pm Wed Sep 14 17:40:28 2005 -#@@ -584,7 +584,9 @@ -# if ($self->has_missing) { -# my $missing = $self->missing; -# for my $m (@$missing) { -#- $msgs{$m} = _error_msg_fmt($profile{format},$profile{missing}); -#+ $msgs{$m} = _error_msg_fmt($profile{format}, -#+ (ref $profile{missing} eq 'HASH' ? -#+ ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); -# } -# } BEGIN { - eval 'use Data::FormValidator 4.00'; - if (!$@) { - ############################################################# - # This is here until the patch makes it to release - ############################################################# - no warnings 'redefine'; - sub Data::FormValidator::Results::msgs { - my $self = shift; - my $controls = shift || {}; - if (defined $controls and ref $controls ne 'HASH') { - die "$0: parameter passed to msgs must be a hash ref"; - } - - - # Allow msgs to be called more than one to accumulate error messages - $self->{msgs} ||= {}; - $self->{profile}{msgs} ||= {}; - $self->{msgs} = { %{ $self->{msgs} }, %$controls }; - - # Legacy typo support. - for my $href ($self->{msgs}, $self->{profile}{msgs}) { - if ( - (not defined $href->{invalid_separator}) - && (defined $href->{invalid_seperator}) - ) { - $href->{invalid_separator} = $href->{invalid_seperator}; - } - } - - my %profile = ( - prefix => '', - missing => 'Missing', - invalid => 'Invalid', - invalid_separator => ' ', - - format => '<span style="color:red;font-weight:bold"><span class="dfv_errors">* %s</span></span>', - %{ $self->{msgs} }, - %{ $self->{profile}{msgs} }, - ); - - - my %msgs = (); - - # Add invalid messages to hash - # look at all the constraints, look up their messages (or provide a default) - # add field + formatted constraint message to hash - if ($self->has_invalid) { - my $invalid = $self->invalid; - for my $i ( keys %$invalid ) { - $msgs{$i} = join $profile{invalid_separator}, map { - Data::FormValidator::Results::_error_msg_fmt($profile{format},($profile{constraints}{$_} || $profile{invalid})) - } @{ $invalid->{$i} }; - } - } - - # Add missing messages, if any - if ($self->has_missing) { - my $missing = $self->missing; - for my $m (@$missing) { - $msgs{$m} = Data::FormValidator::Results::_error_msg_fmt($profile{format}, - (ref $profile{missing} eq 'HASH' ? - ($profile{missing}->{$m} || $profile{missing}->{default} || 'Missing') : $profile{missing})); - } - } - - my $msgs_ref = Data::FormValidator::Results::prefix_hash($profile{prefix},\%msgs); - - $msgs_ref->{ $profile{any_errors} } = 1 if defined $profile{any_errors}; - - return $msgs_ref; - } - ############################################################# - - $DFV = Data::FormValidator->new({ - orders_view => { - required => [qw/id/], - field_filters => { - id => ['trim'] - }, - msgs => { - missing => { - default => 'Field is blank!', - id => 'The order id is required to view an order' - }, - format => '%s' - } - } - }); - }; + use base qw/Catalyst::Controller/; + use Handel::Constants qw/:order/; + use FormValidator::Simple 0.17; + use YAML; }; -sub begin : Private { +=head1 NAME + +[% class %] - Catalyst Controller + +=head1 DESCRIPTION + +Catalyst Controller. + +=head1 METHODS + +=head2 COMPONENT + +=cut + +sub COMPONENT { + my $self = shift->NEXT::COMPONENT(@_); + + $self->{'validator'} = FormValidator::Simple->new; + $self->{'validator'}->set_messages( + $_[0]->path_to('root', '[% action %]', 'messages.yml') + ); + + $self->{'profiles'} = YAML::LoadFile($_[0]->path_to('root', '[% action %]', 'profiles.yml')); + + return $self; +}; + +=head2 default + +Default action when browsing to [% uri %]/ that lists the saved orders for the +current shopper. If no session exists, or the shopper id isn't set, no orders +will be loaded. This keeps non-shoppers like Google and others from wasting +sessions and order records for no good reason. + +=cut + +sub default : Private { my ($self, $c) = @_; - my $shopperid = $c->req->cookie('shopperid'); + $c->stash->{'template'} = '[% action %]/default'; - if (!$shopperid || !$shopperid->value) { - $c->res->redirect($c->req->base . 'cart/'); - } else { - $shopperid = $shopperid->value; - $c->stash->{'shopperid'} = $shopperid; + if ($c->sessionid && $c->session->{'shopper'}) { + my $orders = $c->model('[% model %]')->search({ + shopper => $c->session->{'shopper'}, + type => ORDER_TYPE_SAVED + }); + + $c->stash->{'orders'} = $orders; }; + + return; }; -sub end : Private { - my ($self, $c) = @_; +=head2 create + +Creates a new order from the current shopping cart. + + my $order = $c->forward('create'); + +=cut + +sub create : Private { + my ($self, $c, $cart) = @_; + + if ($c->sessionid && $c->session->{'shopper'}) { + return $c->model('[% model %]')->create({ + shopper => $c->session->{'shopper'}, + type => ORDER_TYPE_TEMP, + cart => $cart + }); + }; - $c->forward($c->view('TT')) - unless ( $c->res->output || $c->res->body || ! $c->stash->{template} ); + return; }; -sub default : Private { +=head2 load + +Loads the current temporary order for the current shopper. + + my $order = $c->forward('load'); + +=cut + +sub load : Private { my ($self, $c) = @_; - $c->forward('list'); + if ($c->sessionid && $c->session->{'shopper'}) { + return $c->model('[% model %]')->search({ + shopper => $c->session->{'shopper'}, + type => ORDER_TYPE_TEMP + })->first; + }; + + return; }; +=head2 view + +=over + +=item Parameters: id + +=back + +Loads the specified order and displays its details during a GET operation. + + [% uri %]/view/$id + +=cut + sub view : Local { my ($self, $c, $id) = @_; - my @messages; - my $results; - - if ($DFV) { - $results = $DFV->check({id => $id}, 'orders_view'); + $c->stash->{'template'} = '[% action %]/view'; + + if ($id && $c->sessionid && $c->session->{'shopper'}) { + if ($c->forward('validate', [{id => $id}])) { + my $order = $c->model('[% model %]')->search({ + shopper => $c->session->{'shopper'}, + id => $id, + type => ORDER_TYPE_SAVED + })->first; + + if ($order) { + $c->stash->{'order'} = $order; + $c->stash->{'items'} = $order->items; + }; + }; }; - if ($results || !$DFV) { - if ($results) { - $id = $results->valid('id'); - }; + return; +}; - eval { - $c->stash->{'order'} = $c->model('[% model %]')->load({ - shopper => $c->stash->{'shopperid'}, - type => ORDER_TYPE_SAVED, - id => $id - }, RETURNAS_ITERATOR)->first; - }; - if ($@) { - push @messages, $@; - }; - } else { - push @messages, map {$_} values %{$results->msgs}; +=head2 validate + +Validates the current form parameters using the profile in profiles.yml that +matches the current action. + + if ($c->forward('validate')) { + }; - if (scalar @messages) { - $c->stash->{'messages'} = \@messages; +=cut + +sub validate : Private { + my ($self, $c, $query) = @_; + + $query ||= $c->req; + + $self->{'validator'}->results->clear; + + my $results = $self->{'validator'}->check( + $query, + $self->{'profiles'}->{$c->action} + ); + + if ($results->success) { + return $results; + } else { + $c->stash->{'errors'} = $results->messages($c->action); }; - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/view.tt'; + return; }; -sub list : Local { - my ($self, $c) = @_; +=head1 AUTHOR - $c->stash->{'orders'} = $c->model('[% model %]')->load({ - shopper => $c->stash->{'shopperid'}, - type => ORDER_TYPE_SAVED - }, RETURNAS_ITERATOR); +A clever guy - $c->stash->{'template'} = '[% uri.replace('^/', '') %]/list.tt'; -}; +=head1 LICENSE + +This library is free software, you can redistribute it and/or modify +it under the same terms as Perl itself. + +=cut 1; __test__ -use Test::More tests => 2; +use Test::More tests => 3; use strict; use warnings; use_ok('Catalyst::Test', '[% app %]'); use_ok('[% class %]'); -__list__ -[% TAGS [- -] %] + +ok(request('[% uri %]')->is_success, 'Request should succeed'); +__default__ +[% TAGS [- -] -%] [% USE HTML %] -<h1>Your Previous Orders</h1> -<p> - <a href="[% base _ '[- uri.replace('^/', '') -]/' %]">View Order List</a> -</p> -[% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> -[% END %] +<h1>Your Order History</h1> [% IF orders.count %] <table border="0" cellpadding="3" cellspacing="5"> <tr> @@ -249,7 +312,7 @@ __list__ [% WHILE (order = orders.next) %] <tr> <td align="left"> - <a href="[% base _ '[- uri.replace('^/', '') -]/view/' _ order.id _ '/' %]">[% HTML.escape(order.number) %]</a> + <a href="[% c.uri_for('[- uri -]/view', order.id, '') %]">[% HTML.escape(order.number) %]</a> </td> <td> [% HTML.escape(order.updated) %] @@ -261,13 +324,11 @@ __list__ <p>You have no orders.</p> [% END %] __view__ -[% TAGS [- -] %] +[% TAGS [- -] -%] [% USE HTML %] +<h1>Order Details</h1> +[% INCLUDE [- action -]/errors %] [% IF order %] - <h1>Order# [% HTML.escape(order.number) %]</h1> - <p> - <a href="[% base _ '[- uri.replace('^/', '') -]/' %]">View Order List</a> - </p> <table border="0" cellpadding="3" cellspacing="5"> <tr> <th colspan="2" align="left">Billing</th> @@ -404,7 +465,7 @@ __view__ <th align="center">Quantity</th> <th align="right">Total</th> </tr> - [% FOREACH item = order.items %] + [% WHILE (item = items.next) %] <tr> <td align="left">[% HTML.escape(item.sku) %]</td> <td align="left">[% HTML.escape(item.description) %]</td> @@ -438,72 +499,31 @@ __view__ </td> </table> [% ELSE %] - <h1>Order Not Found</h1> - <p> - <a href="[% base _ '[- uri.replace('^/', '') -]/' %]">View Order List</a> - </p> - [% IF messages %] - <ul> - [% FOREACH message IN messages %] - <li>[% message %]</li> - [% END %] - </ul> - [% END %] - <p>The order requested could not be found.</p> + <p>The order requested could not be found.</p> [% END %] -__END__ - -=head1 NAME - -Catalyst::Helper::Controller::Handel::Order - Helper for Handel::Order Controllers - -=head1 SYNOPSIS - - script/create.pl controller <newclass> Handel::Order [<modelclass>] - script/create.pl controller Orders Handel::Order OrderModel - -=head1 DESCRIPTION - -A Helper for creating controllers based on Handel::Order objects. If no modelclass -is specified, ::M::Orders is assumed. - -The modelclass argument tries to do the right thing with the names given to it. - -For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully -qualified package name: - - MyApp::M::OrderModel - MyApp::Model::OrderModel - OrderModel - -In all three cases everything before M{odel)|C(ontroller) will be stripped and the class OrderModel -will be used. - -By default, the code generated by this helper requires Data::FormValidator 4.00 or greater -to be installed for it's form validation. If you don't want to install Data::FormValidator, -simply comment out this line in the generated controller class: - - use Data::FormValidator 4.00; - -The code is designed to work without Data::FormValidator 4.00 installed. - -=head1 METHODS - -=head2 mk_compclass - -Makes a Handel::Order Controller class and template files for you. - -=head2 mk_comptest - -Makes a Handel::Order Controller test for you. - -=head1 SEE ALSO - -L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Order> - -=head1 AUTHOR +[% TAGS [- -] -%] +__errors__ +[% TAGS [- -] -%] +[% IF errors %] + <ul class="errors"> + [% FOREACH error IN errors %] + <li>[% HTML.escape(error) %]</li> + [% END %] + </ul> +[% END %] +__messages__ +[% action %]/view: + id: + REGEX: The id field is in the wrong format. + +__profiles__ +[% action %]/view: + - id + - + - + - REGEX + - !perl/regexp: + REGEXP: '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$' + MODIFIERS: i - Christopher H. Laco - CPAN ID: CLACO - claco@chrislaco.com - http://today.icantfocus.com/blog/ +__END__ lib/Catalyst/Helper/Controller/Handel/Order.pm @@ -1,19 +1,28 @@ # $Id$ +## no critic (ProhibitCaptureWithoutTest) package Catalyst::Helper::Handel::Scaffold; use strict; use warnings; -use Path::Class; + +BEGIN { + use Catalyst 5.7001; + use Catalyst::Utils; + use Path::Class; +}; sub mk_stuff { my ($self, $helper, $dsn, $user, $pass, $cart, $order, $checkout) = @_; $cart ||= 'Cart'; - $order ||= 'Orders'; + $order ||= 'Order'; $checkout ||= 'Checkout'; - $cart = $cart =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i ? $3 : 'Cart'; - $order = $order =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i ? $3 : 'Orders'; - $checkout = $checkout =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i ? $3 : 'Checkout'; + $cart =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i; + $cart = $3 ? $3 : 'Cart'; + $order =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i; + $order = $3 ? $3 : 'Order'; + $checkout =~ /^(.*::(Model|M|C|Controller)?::)?(.*)$/i; + $checkout = $3 ? $3 : 'Checkout'; my $app = $helper->{'app'}; @@ -23,6 +32,8 @@ sub mk_stuff { $helper->mk_component($app, 'controller', $cart, 'Handel::Cart', $cart, $checkout); $helper->mk_component($app, 'controller', $order, 'Handel::Order', $order); $helper->mk_component($app, 'controller', $checkout, 'Handel::Checkout', $cart, $order, $cart, $order); + + return; }; 1; @@ -39,29 +50,31 @@ Catalyst::Helper::Handel::Scaffold - Helper for creating Handel framework scaffo =head1 DESCRIPTION -A Helper for creating an entire cart/order/checkout framework scaffold. +Handel::Scaffold is a meta Helper for creating the entire cart/order/checkout +framework using the other helpers included in this dist. + If cartname isn't specified, Cart is assumed. If ordername isn't specified, Orders is assumed. If no checkoutname is given, Checkout is assumed. -The cartname, ordername, and checkoutname arguments try to do the right thing with the -names given to them. +The cartname, ordername, and checkoutname arguments try to do the right thing +with the names given to them. -For example, you can pass the shortened class name without the MyApp::M/C, or pass the fully -qualified package name: +For example, you can pass the shortened class name without the MyApp::M/C, or +pass the fully qualified package name: MyApp::M::CartModel MyApp::Model::CartModel CartModel -In all three cases everything before M{odel)|C(ontroller) will be stripped and the class CartModel -will be used. +In all three cases everything before M{odel)|C(ontroller) will be stripped and +the class CartModel will be used. =head1 METHODS =head2 mk_stuff -Makes Cart and Order models, Cart, Order and Checkout controllers, templates files -and a TT view for you. +Makes Cart and Order models, Cart, Order and Checkout controllers, templates +files and a TT view for you. =head1 SEE ALSO @@ -72,4 +85,4 @@ L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Cart> Christopher H. Laco CPAN ID: CLACO claco@chrislaco.com - http://today.icantfocus.com/blog/ \ No newline at end of file + http://today.icantfocus.com/blog/ lib/Catalyst/Helper/Handel/Scaffold.pm @@ -3,76 +3,118 @@ package Catalyst::Helper::Model::Handel::Cart; use strict; use warnings; +BEGIN { + use Catalyst 5.7001; +}; + +=head1 NAME + +Catalyst::Helper::Model::Handel::Cart - Helper for Handel::Cart Models + +=head1 SYNOPSIS + + script/create.pl model <newclass> Handel::Cart <dsn> [<username> <password>] + script/create.pl model Cart Handel::Cart dbi:mysql:localhost myuser mysecret + +=head1 DESCRIPTION + +A Helper for creating models based on Handel::Cart objects. + +=head1 METHODS + +=head2 mk_compclass + +Makes a Handel::Cart Model class for you. + +=cut + sub mk_compclass { my ($self, $helper, $dsn, $user, $pass) = @_; my $file = $helper->{file}; + my $app = $helper->{app}; + $helper->{'dsn'} = $dsn || ''; $helper->{'user'} = $user || ''; $helper->{'pass'} = $pass || ''; - $helper->render_file('model', $file); + if ($helper->{'handel_auto_wire_models'}) { + $helper->{'handel_auto_wireup'} = "cart_class => '$app\:\:Cart',\n "; + }; + + return $helper->render_file('model', $file); }; + +=head2 mk_comptest + +Makes a Handel::Cart Model test for you. + +=cut + sub mk_comptest { my ($self, $helper) = @_; my $test = $helper->{'test'}; - $helper->render_file('test', $test); + return $helper->render_file('test', $test); }; +=head1 SEE ALSO + +L<Catalyst::Manual>, L<Catalyst::Helper>, L<Catalyst::Model::Handel::Cart> + +=head1 AUTHOR + + Christopher H. Laco + CPAN ID: CLACO + claco@chrislaco.com + http://today.icantfocus.com/blog/ + +=cut + 1; __DATA__ + +=begin pod_to_ignore + __model__ package [% class %]; use strict; use warnings; -use base 'Handel::Cart'; -{ - $^W = 0; - Handel::DBI->connection('[% dsn %]', '[% user %]', '[% pass %]'); +BEGIN { + use base qw/Catalyst::Model::Handel::Cart/; }; -1; -__test__ -use Test::More tests => 2; -use strict; -use warnings; - -use_ok('Catalyst::Test', '[% app %]'); -use_ok('[% class %]'); -__END__ +__PACKAGE__->config( + [% handel_auto_wireup %]connection_info => ['[% dsn %]', '[% user %]', '[% pass %]'] +); =head1 NAME -Catalyst::Helper::Model::Handel::Cart - Helper for Handel::Cart Models +[% class %] - Catalyst cart model component. =head1 SYNOPSIS - script/create.pl model <newclass> Handel::Cart <dsn> [<username> <password>] - script/create.pl model Cart Handel::Cart dbi:mysql:dbname=handel.db myuser mysecret +See L<[% app %]>. =head1 DESCRIPTION -A Helper for creating models based on Handel::Cart objects. +Catalyst cart model component. -=head1 METHODS - -=head2 mk_compclass - -Makes a Handel::Cart Model class for you. +=head1 AUTHOR -=head2 mk_comptest +[% author %] -Makes a Handel::Cart Model test for you. - -=head1 SEE ALSO +=cut -L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Cart> - -=head1 AUTHOR +1; +__test__ +use Test::More tests => 2; +use strict; +use warnings; - Christopher H. Laco - CPAN ID: CLACO - claco@chrislaco.com - http://today.icantfocus.com/blog/ +BEGIN { + use_ok('Catalyst::Test', '[% app %]'); + use_ok('[% class %]'); +}; +__END__ lib/Catalyst/Helper/Model/Handel/Cart.pm @@ -3,76 +3,117 @@ package Catalyst::Helper::Model::Handel::Order; use strict; use warnings; +BEGIN { + use Catalyst 5.7001; +}; + +=head1 NAME + +Catalyst::Helper::Model::Handel::Order - Helper for Handel::Order Models + +=head1 SYNOPSIS + + script/create.pl model <newclass> Handel::Order <dsn> [<username> <password>] + script/create.pl model Order Handel::Order dbi:mysql:localhost myuser mysecret + +=head1 DESCRIPTION + +A Helper for creating models based on Handel::Order objects. + +=head1 METHODS + +=head2 mk_compclass + +Makes a Handel::Order Model class for you. + +=cut + sub mk_compclass { my ($self, $helper, $dsn, $user, $pass) = @_; my $file = $helper->{file}; + my $app = $helper->{app}; + $helper->{'dsn'} = $dsn || ''; $helper->{'user'} = $user || ''; $helper->{'pass'} = $pass || ''; - $helper->render_file('model', $file); + if ($helper->{'handel_auto_wire_models'}) { + $helper->{'handel_auto_wireup'} = "order_class => '$app\:\:Order',\n "; + }; + + return $helper->render_file('model', $file); }; +=head2 mk_comptest + +Makes a Handel::Order Model test for you. + +=cut + sub mk_comptest { my ($self, $helper) = @_; my $test = $helper->{'test'}; - $helper->render_file('test', $test); + return $helper->render_file('test', $test); }; +=head1 SEE ALSO + +L<Catalyst::Manual>, L<Catalyst::Helper>, L<Catalyst::Model::Handel::Order> + +=head1 AUTHOR + + Christopher H. Laco + CPAN ID: CLACO + claco@chrislaco.com + http://today.icantfocus.com/blog/ + +=cut + 1; __DATA__ + +=begin pod_to_ignore + __model__ package [% class %]; use strict; use warnings; -use base 'Handel::Order'; -{ - $^W = 0; - Handel::DBI->connection('[% dsn %]', '[% user %]', '[% pass %]'); +BEGIN { + use base qw/Catalyst::Model::Handel::Order/; }; -1; -__test__ -use Test::More tests => 2; -use strict; -use warnings; - -use_ok('Catalyst::Test', '[% app %]'); -use_ok('[% class %]'); -__END__ +__PACKAGE__->config( + [% handel_auto_wireup %]connection_info => ['[% dsn %]', '[% user %]', '[% pass %]'] +); =head1 NAME -Catalyst::Helper::Model::Handel::Order - Helper for Handel::Order Models +[% class %] - Catalyst cart model component. =head1 SYNOPSIS - script/create.pl model <newclass> Handel::Order <dsn> [<username> <password>] - script/create.pl model Order Handel::Order dbi:mysql:dbname=handel.db myuser mysecret +See L<[% app %]>. =head1 DESCRIPTION -A Helper for creating models based on Handel::Order objects. +Catalyst cart model component. -=head1 METHODS - -=head2 mk_compclass - -Makes a Handel::Order Model class for you. +=head1 AUTHOR -=head2 mk_comptest +[% author %] -Makes a Handel::Order Model test for you. - -=head1 SEE ALSO +=cut -L<Catalyst::Manual>, L<Catalyst::Helper>, L<Handel::Order> - -=head1 AUTHOR +1; +__test__ +use Test::More tests => 2; +use strict; +use warnings; - Christopher H. Laco - CPAN ID: CLACO - claco@chrislaco.com - http://today.icantfocus.com/blog/ +BEGIN { + use_ok('Catalyst::Test', '[% app %]'); + use_ok('[% class %]'); +}; +__END__ lib/Catalyst/Helper/Model/Handel/Order.pm @@ -2,56 +2,36 @@ package Handel; use strict; use warnings; -use vars qw($VERSION); +use vars qw/$VERSION/; -$VERSION = '0.33'; +$VERSION = '1.00000'; BEGIN { - use Handel::ConfigReader; - - $Handel::Cfg = Handel::ConfigReader->new; + use base qw/Class::Accessor::Grouped/; + use Handel::Exception qw/:try/; + use Handel::L10N qw/translate/; +}; - my $uuidsub; +__PACKAGE__->config_class('Handel::ConfigReader'); - if ($^O ne 'openbsd' && eval{require APR::UUID}) { - $uuidsub = sub { - return APR::UUID->new->format; - }; - } elsif (eval{require UUID}) { - $uuidsub = sub { - my ($uuid, $uuidstring); - UUID::generate($uuid); - UUID::unparse($uuid, $uuidstring); +sub config_class { + my ($self, $config_class) = @_; - return $uuidstring; - }; - } elsif (eval{require Data::UUID}) { - $uuidsub = sub { - my $ug = Data::UUID->new; - my $uuid = $ug->create; + if ($config_class) { + eval "require $config_class"; ## no critic - return $ug->to_string($uuid); - }; - } elsif (eval{ - # for some reason 'no warnings' won't squelch - # the 'too late for INIT' warning in Win32::API::Type - local $^W = 0; - require Win32::Guidgen; - }) { - $uuidsub = sub { - return Win32::Guidgen::create(); - }; - } elsif (eval{require Win32API::GUID}) { - $uuidsub = sub { - return Win32API::GUID::CreateGuid(); - }; - } else { throw Handel::Exception( - -text => 'Required modules not found', - -details => 'UUID/Data::UUID' - ); + -details => translate('The config_class [_1] could not be loaded', $config_class) + ) if $@; ## no critic + + $self->set_inherited('config_class', $config_class); }; - *Handel::newuuid = $uuidsub; + + return $self->get_inherited('config_class'); +}; + +sub config { + return shift->config_class->instance; }; 1; @@ -59,250 +39,47 @@ __END__ =head1 NAME -Handel - Simple commerce framework with AxKit/TT/Catalyst support - -=head1 DESCRIPTION - -Handel is a quick and not-so-dirty ecommerce framework with L<AxKit> taglib -support and TT2 (Template Toolkit) support. It was started for the conversion -of an IIS/ASP based commerce site to Apache/ModPerl, but I decided that is -might be useful to others so here it is on CPAN. - -For the curious, Handel is German for commerce. - -=head1 WEBSITE - -You can get the latest news, source, documentation and wiki help at http://handelframework.com/. - -=head1 MAILING LIST - -Join the mailing list at http://lists.rawmode.org/cgi-bin/mailman/listinfo/handel. -Big thanks to gabb@#catalyst for the list space. - -=head1 GOALS - -=over - -=item Database agnostic. Thanks to Class::DBI and staying away from auto incrementing ids, -Handel should run in any database that Class::DBI supports. - -=item Implementation agnostic. Handel should be able to be used from the command line, -from a web page, from a SOAP service, or from a GUI application. It's simply a data access mechanism. -Any interaction with forms, web pages, browser, cookies, etc is the responsibility of the consumer - -=item Checkout agnostic. A checkout process means different things to different people in -different situations. The Handel checkout pipeline by itself does absolutely nothing with -an order. It is instead a plugin manager that allows you to specify and build plugins to do -various actions (payment authorization, address validation, fax delivery, etc). Each site, server, page, -even process() call can have it's own unique order processing pipeline. - -=item Easy integration into AxKit using taglibs. - -=item Easy integration into TT2 using plugins. - -=item Easy integration into Catalyst using plugins. - -=item Easy integration into other systems using SOAP. - -=item Feature complete demo site in AxKit. - -=item Feature complete demo site in TT2. - -=item Feature complete demo site in Catalyst. - -=item Public Subversion repository. - -=item Public Wiki/Docs site. - -=item Get someone to actually use the damn thing. :-) - -=item Abstract schema into SQL::Translator scripts - -=back - -=head1 WHAT HANDEL IS - -=over - -=item Simple cart and order record maintenance. - -=item Plugin based checkout pipeline processing framework. - -=back - -=head1 WHAT HANDEL ISN'T - -=over - -=item Intershop, Cart32, WebGUI, CMS, complete web commerce packageB<(1)>. -Handel is a simple framework to load/upload cart/order data and shove that -data through a plugin based pipeline. - -=item B<(1)> While it is not a complete web based commerce system, I do plan on having -feature complete working demos sites so people can still quick-start their own projects. - -=back - -=head1 FEATURES - -=over - -=item Add/Update/Delete/Save/Restore Cart Contents - -=item Full AxKit XSP Taglib Support - -=item Template Toolkit 2 Plugin Support +Handel - A cart/order/checkout framework with AxKit/TT/Catalyst support -=item Currency Conversion +=head1 SYNOPSIS -=item Currency Formatting + use Handel; + Handel->config_class('My::ConfigReader'); + + my $config = Handel->config; + # $config->isa('My::ConfigReader') -=item Basic Localization Support - -=item Multiple Database Support +=head1 DESCRIPTION -=back +This is a generic class containing the default configuration used by other +Handel classes. -=head1 REQUIREMENTS +To learn more about what Handel is and how it works, take a look at the +L<manual|Handel::Manual>. -=head2 Prerequisites +=head1 METHODS -The following modules are required for Handel to work properly. Older versions -may work fine, but these are the versions I have installed and verified to -work correctly. If you have older versions and all tests pass, send me an email -and I'll lower the version requirements. +=head2 config_class =over -=item Class::DBI - -C<Class::DBI> version 0.96 or greater. - -=item DBI - -C<DBI> version 1.36 or greater. - -=item Error - -C<Error> version 0.14 or greater. - -=item Locale::Maketext - -C<Locale::Maketext> version 1.06 or greater. - -=item Data::UUID - -At least one of the following modules are required to create uuids: -C<UUID> 0.02, C<Win32::Guidgen> 0.04, C<Win32API::GUID> 0.02, -or C<Data::UUID> 0.10. +=item Arguments: $config_class =back -=head2 Optional Modules - -The following modules are not required for Handel to run, although some -features may be unavailable without them. - -=over - -=item AxKit - -C<AxKit> version 1.61 or greater. - -C<AxKit> is only required if you plan on using C<Handel> within XSP using the -supplied taglibs. - -=item Locale::Currency::Format - -C<Locale::Currency::Format> version 1.22 or greater. - -When present, this module allows all prices to be formatted to specific -currency codes and formats. - -=item Finance::Currency::Convert::WebserviceX - -C<Finance::Currency::Convert::WebserviceX> version 0.03 or greater. - -When present, this module allows all prices to be converted from one currency -to another. - -=item Locale::Currency - -C<Locale::Currency> version 2.07 or greater. - -When present, this module allows all conversion and currency codes -to be verified as real 3 letter ISO currency codes. - -=item Template - -C<Template> version 2.07 or greater. - -C<Template> (TT2/Template ToolKit) is only required if you plan on using Handel -within TT2 based websites. - -=back - -=head2 Build/Test Modules - -The following modules are only required for the test suite when running -C<make test>. - -=over - -=item Test::More - -C<Test::More> version 0.48 or greater. - -The C<Test::More> included with perl 5.8.4 and C<Test::More> <= 0.48 have issues -with ithreads that usually cause crashes in tests that use C<Class::DBI> or -C<DBIx:ContextualFetch>. The errors usual mention -"attempt to free unreferenced scalar". If you receive these during C<make test>, -try upgrading C<Test::More>. - -=item Pod::Coverage - -C<Pod::Coverage> version 0.14 or greater. - -The pod coverage tests may fail complaining about missing pod for methods if -Pod::Coverage < 0.14 is installed. This is due to certain syntax variations of -the pod with escaped gt/lt. I may just alter the pod and bump this version down -if there is enough feedback to do so. - -=item Test::Pod - -C<Test::Pod> version 1.00 or greater. - -C<Test::Pod> 1.00 added the C<all_pod_files_ok()> method which makes my life -easier. :-) - -=item Test::Pod::Coverage - -C<Test::Pod::Coverage> version 1.04 or greater. - -C<Test::Pod::Coverage> 1.04 was made taint safe, and we run the tests with -wT -like good girls and boys. - -=item Test:Strict - -C<Test::Strict> version 0.01 or greater. - -This keeps me honest and makes sure I always C<use strict>. - -=back +Gets/sets the name of the configuration class to use. The default configuration +class is Handel::ConfigReader. -=head1 CAVEATS +A L<Handel::Exception|Handel::Exception> exception will be thrown if the +specified class can not be loaded. -When using item_class to specify the item class returned from add/items in your -subclass under Class::DBI < 3.0.8, the item_class specified will be returned from -all cart classes, including Handel::Cart itself. In most cases, people are only -using one subclass of Handel::Cart so this won't effect them. +=head2 config -If you plan on using multiple subclasses of Handel::Cart that may or may not -return custom items, upgrade your Class::DBI to version 3.0.8 or greater. +Returns an instance of the specified configuration class. =head1 SEE ALSO -L<Handel::Cart> +L<Handel::Cart>, L<Handel::Order>, L<Handel::Checkout> =head1 AUTHOR lib/Handel.pm @@ -4,214 +4,168 @@ use strict; use warnings; BEGIN { - use base 'Handel::DBI'; - use Handel::Constants qw(:cart :returnas); - use Handel::Constraints qw(:all); - use Handel::Currency; - use Handel::L10N qw(translate); - - __PACKAGE__->mk_classdata(_item_class => 'Handel::Cart::Item'); + use Handel::Constants qw/:cart/; + use Handel::Constraints qw/:all/; + use Handel::L10N qw/translate/; + use Scalar::Util qw/blessed/; + + use base qw/Handel::Base/; + __PACKAGE__->item_class('Handel::Cart::Item'); + __PACKAGE__->storage_class('Handel::Storage::DBIC::Cart'); + __PACKAGE__->create_accessors; }; -__PACKAGE__->autoupdate(1); -__PACKAGE__->table('cart'); -__PACKAGE__->iterator_class('Handel::Iterator'); -__PACKAGE__->columns(All => qw(id shopper type name description)); -__PACKAGE__->has_many(_items => 'Handel::Cart::Item', 'cart'); -__PACKAGE__->add_constraint('id', id => \&constraint_uuid); -__PACKAGE__->add_constraint('shopper', shopper => \&constraint_uuid); -__PACKAGE__->add_constraint('type', type => \&constraint_cart_type); - -sub new { - my ($self, $data) = @_; - - throw Handel::Exception::Argument( - -details => translate('Param 1 is not a HASH reference') . '.') unless - ref($data) eq 'HASH'; - - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; - }; +sub create { + my ($self, $data, $opts) = @_; - if (!defined($data->{'type'})) { - $data->{'type'} = CART_TYPE_TEMP; + if (ref $data ne 'HASH') { + throw Handel::Exception::Argument( + -details => translate('PARAM1_NOT_HASHREF') + ); }; - if ($data->{'type'} == CART_TYPE_SAVED && !$data->{'name'}) { - throw Handel::Exception::Constraint( - -details => translate( - 'Cart name is required when creating a saved cart') . '.'); + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; - return $self->insert($data); + return $self->create_instance( + $storage->create($data) + ); }; sub add { my ($self, $data) = @_; throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not a HASH reference or Handel::Cart::Item') . '.') unless - (ref($data) eq 'HASH' or $data->isa('Handel::Cart::Item')); + translate('PARAM1_NOT_HASHREF_CARTITEM') + ) unless (ref($data) eq 'HASH' or $data->isa('Handel::Cart::Item')); ## no critic - if (ref($data) eq 'HASH') { - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; - }; + my $result = $self->result; + my $storage = $result->storage; - return $self->add_to__items($data); + if (ref($data) eq 'HASH') { + return $self->item_class->create_instance( + $result->add_item($data) + ); } else { my %copy; - foreach ($data->columns) { - next if $_ =~ /^(id|cart)$/i; - $copy{$_} = $data->$_; + foreach ($storage->copyable_item_columns) { + if ($data->can($_)) { + $copy{$_} = $data->$_; + } elsif ($data->result->can($_)) { + $copy{$_} = $data->result->$_; + }; }; - $copy{'id'} = $self->uuid; - - return $self->add_to__items(\%copy); + return $self->item_class->create_instance( + $result->add_item(\%copy) + ); }; }; sub clear { my $self = shift; - $self->_items->delete_all; - - return undef; + return $self->result->delete_items; }; sub count { - my $self = shift; + my $self = shift; - return $self->_items->count || 0; + return $self->result->count_items; }; sub delete { my ($self, $filter) = @_; - throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($filter) eq 'HASH'; + if (ref $filter ne 'HASH') { + throw Handel::Exception::Argument( + -details => translate('PARAM1_NOT_HASHREF') + ); + }; - ## I'd much rather use $self->_items->search_like, but it doesn't work that - ## way yet. This should be fine as long as :weaken refs works. - return $self->item_class->search_like(%{$filter}, - cart => $self->id)->delete_all; + return $self->result->delete_items($filter); }; sub destroy { - my ($self, $filter) = @_; + my ($self, $filter, $opts) = @_; - if (ref $self) { - $self->SUPER::delete; + if (blessed $self && !defined $filter) { + my $result = $self->result->delete; + if ($result) { + undef ($self); + }; + return $result; } else { throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($filter) eq 'HASH'; + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic - my $carts = $self->load($filter, RETURNAS_ITERATOR); - while (my $cart = $carts->next) { - $cart->clear; - $cart->SUPER::delete; + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; - }; - - return; -}; - -sub item_class { - my ($class, $item_class) = @_; - - if ($item_class) { - eval "require $item_class"; - require version; - my $cdbiver = version->new(Class::DBI->VERSION); - - if ($cdbiver->numify < 3.000008) { - undef(*_items); - undef(*add_to__items); - __PACKAGE__->has_many(_items => $item_class, 'cart'); - } else { - $class->has_many(_items => $item_class, 'cart'); - }; - } else { - return $class->_item_class; + return $storage->delete($filter); }; }; sub items { - my ($self, $filter, $wantiterator) = @_; + my ($self, $filter, $opts) = @_; + my $result = $self->result; + my $storage = $result->storage; + + $filter ||= {}; + $opts ||= {}; throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless( - ref($filter) eq 'HASH' or !$filter); + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic - $wantiterator ||= RETURNAS_AUTO; - $filter ||= {}; + throw Handel::Exception::Argument( -details => + translate('PARAM2_NOT_HASHREF') + ) unless ref($opts) eq 'HASH'; ## no critic - my $wildcard = Handel::DBI::has_wildcard($filter); + my $results = $result->search_items($filter, $opts); + my $iterator = $self->item_class->result_iterator_class->new({ + data => $results, + result_class => $self->item_class + }); - ## If the filter as a wildcard, push it through a fresh search_like since it - ## doesn't appear to be available within a loaded object. - if ((wantarray && $wantiterator != RETURNAS_ITERATOR) || $wantiterator == RETURNAS_LIST) { - my @items = $wildcard ? - $self->item_class->search_like(%{$filter}, cart => $self->id) : - $self->_items(%{$filter}); + return wantarray ? $iterator->all : $iterator; +}; - return @items; - } elsif ($wantiterator == RETURNAS_ITERATOR) { - my $iterator = $wildcard ? - $self->item_class->search_like(%{$filter}, cart => $self->id) : - $self->_items(%{$filter}); +sub search { + my ($self, $filter, $opts) = @_; + my $class = blessed $self ? blessed $self : $self; - return $iterator; - } else { - my $iterator = $wildcard ? - $self->item_class->search_like(%{$filter}, cart => $self->id) : - $self->_items(%{$filter}); - if ($iterator->count == 1 && $wantiterator != RETURNAS_ITERATOR && $wantiterator != RETURNAS_LIST) { - return $iterator->next; - } else { - return $iterator; - }; - }; -}; + $filter ||= {}; + $opts ||= {}; -sub load { - my ($self, $filter, $wantiterator) = @_; + throw Handel::Exception::Argument( -details => + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless( - ref($filter) eq 'HASH' or !$filter); - - $wantiterator ||= RETURNAS_AUTO; - - ## only return array if wantarray and not explicitly asking for an iterator - ## or we've explicitly asked for a list/array - if ((wantarray && $wantiterator != RETURNAS_ITERATOR) || $wantiterator == RETURNAS_LIST) { - my @carts = $filter ? $self->search_like(%{$filter}) : - $self->retrieve_all; - return @carts; - ## return an iterator if explicitly asked for - } elsif ($wantiterator == RETURNAS_ITERATOR) { - my $iterator = $filter ? - $self->search_like(%{$filter}) : $self->retrieve_all; - - return $iterator; - ## full out auto - } else { - my $iterator = $filter ? - $self->search_like(%{$filter}) : $self->retrieve_all; + translate('PARAM2_NOT_HASHREF') + ) unless ref($opts) eq 'HASH'; ## no critic - if ($iterator->count == 1 && $wantiterator != RETURNAS_ITERATOR && $wantiterator != RETURNAS_LIST) { - return $iterator->next; - } else { - return $iterator; - }; + my $storage = delete $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; + + my $results = $storage->search($filter, $opts); + my $iterator = $self->result_iterator_class->new({ + data => $results, + result_class => $class + }); + + return wantarray ? $iterator->all : $iterator; }; sub restore { @@ -220,70 +174,70 @@ sub restore { $mode ||= CART_MODE_REPLACE; throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not a HASH reference or Handel::Cart') . '.') unless( - ref($data) eq 'HASH' or $data->isa('Handel::Cart')); + translate('PARAM1_NOT_HASHREF_CART') + ) unless (ref($data) eq 'HASH' || $data->isa('Handel::Cart')); ## no critic my @carts = (ref($data) eq 'HASH') ? - $self->search_like(%{$data}) : $data; + $self->search($data)->all : $data; if ($mode == CART_MODE_REPLACE) { $self->clear; my $first = $carts[0]; - $self->autoupdate(0); $self->name($first->name); $self->description($first->description); - $self->update; - $self->autoupdate(1); - foreach (@carts) { - my $iterator = $_->items(undef, 1); - while (my $item = $iterator->next) { + foreach my $cart (@carts) { + my @items = $cart->items->all; + foreach my $item (@items) { $self->add($item); }; }; } elsif ($mode == CART_MODE_MERGE) { - foreach (@carts) { - my $iterator = $_->items(undef, 1); - while (my $item = $iterator->next) { - if (my $exists = $self->items({sku => $item->sku})){ + foreach my $cart (@carts) { + my @items = $cart->items->all; + foreach my $item (@items) { + if (my $exists = $self->items({sku => $item->sku})->first){ $exists->quantity($item->quantity + $exists->quantity); - $exists->update; } else { $self->add($item); }; }; }; } elsif ($mode == CART_MODE_APPEND) { - foreach (@carts) { - my $iterator = $_->items(undef, 1); - while (my $item = $iterator->next) { + foreach my $cart (@carts) { + my @items = $cart->items->all; + foreach my $item (@items) { $self->add($item); }; }; } else { - return new Handel::Exception::Argument(-text => - translate('Unknown restore mode')); + throw Handel::Exception::Argument(-text => + translate('UNKNOWN_RESTORE_MODE') + ); }; + + return; }; sub save { - $_[0]->type(CART_TYPE_SAVED); + my $self = shift; + $self->type(CART_TYPE_SAVED); - return undef; + return; }; sub subtotal { my $self = shift; - my $it = $self->items(undef, 1); + my $storage = $self->result->storage; + my $items = $self->items; my $subtotal = 0.00; - while ( my $item = $it->next ) { - $subtotal += ( $item->total ); + while (my $item = $items->next) { + $subtotal += ($item->total); }; - return Handel::Currency->new($subtotal); + return $storage->currency_class->new($subtotal); }; 1; @@ -296,17 +250,17 @@ Handel::Cart - Module for maintaining shopping cart contents =head1 SYNOPSIS use Handel::Cart; - - my $cart = Handel::Cart->new({ + + my $cart = Handel::Cart->create({ shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' }); - + $cart->add({ sku => 'SKU1234', quantity => 1, price => 1.25 }); - + my $iterator = $cart->items; while (my $item = $iterator->next) { print $item->sku; @@ -317,237 +271,249 @@ Handel::Cart - Module for maintaining shopping cart contents =head1 DESCRIPTION -C<Handel::Cart> is quick and dirty component for maintaining simple shopping -cart data. - -While C<Handel::Cart> subclasses L<Class::DBI>, it is strongly recommended that -you not use its methods unless it's absolutely necessary. Stick to the -documented methods here and you'll be safe should I decide to implement some -other data access mechanism. :-) +Handel::Cart is component for maintaining simple shopping cart data. =head1 CONSTRUCTOR -There are two ways to create a new cart object. You can either pass a hashref -into C<new> containing all the required values needed to create a new shopping -cart record or pass a hashref into C<load> containing the search criteria to use -to load an existing shopping cart. +=head2 create =over -=item C<Handel::Cart-E<gt>new(\%data)> +=item Arguments: \%data [, \%options] + +=back + +Creates a new shopping cart object containing the specified data. - my $cart = Handel::Cart->new({ + my $cart = Handel::Cart->create({ shopper => '10020400-E260-11CF-AE68-00AA004A34D5', name => 'My Shopping Cart' }); -=item C<Handel::Cart-E<gt>load([\%filter, $wantiterator])> +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if the first parameter is not a hashref. - my $cart = Handel::Cart->load({ - id => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' - }); +The following options are available: -You can also omit \%filter to load all available carts. +=over - my @carts = Handel::Cart->load(); +=item storage -In scalar context C<load> returns a C<Handel::Cart> object if there is a single -result, or a L<Handel::Iterator> object if there are multiple results. You can -force C<load> to always return an iterator even if only one cart exists by -setting the C<$wantiterator> parameter to C<RETURNAS_ITERATOR>. +A storage object to use to create a new cart object. Currently, this storage +object B<must> have the same columns as the default storage object for the +current cart class. - my $iterator = Handel::Cart->load(undef, RETURNAS_ITERATOR); - while (my $item = $iterator->next) { - print $item->sku; - }; +=back + +=head1 METHODS + +=head2 add -See L<Handel::Contstants> for the available C<RETURNAS> options. +=over -A C<Handel::Exception::Argument> exception is thrown if the first parameter is -not a hashref. +=item Arguments: \%data | $item =back -=head1 METHODS +Adds a new item to the current shopping cart and returns an instance of the +item class specified in cart object storage. You can either pass the item +data as a hash reference: + + my $item = $cart->add({ + shopper => '10020400-E260-11CF-AE68-00AA004A34D5', + sku => 'SKU1234', + quantity => 1, + price => 1.25 + }); + +or pass an existing cart item: -=head2 item_class($classname) + my $wishlist = Handel::Cart->search({ + shopper => '10020400-E260-11CF-AE68-00AA004A34D5', + type => CART_TYPE_SAVED + })->first; + + $cart->add( + $wishlist->items({sku => 'ABC-123'})->first + ); + +When passing an existing cart item to add, all columns in the source item will +be copied into the destination item if the column exists in both the +destination and source, and the column isn't the primary key or the foreign +key of the item relationship. -Sets the name of the class to be used when returning or creating cart items. -While you can set this directly in your application, it's best to set it -in a custom subclass of Handel::Cart. +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if the first parameter isn't a hashref or an object that subclasses +Handel::Cart::Item. - package CustomCart; - use strict; - use warnings; - use base 'Handel::Cart'; +=head2 clear - __PACKAGE__->item_class('CustomCart::CustomItem'; +Deletes all items from the current cart. - 1; + $cart->clear; -=head2 Adding Cart Items +=head2 count + +Returns the number of items in the cart object. -You can add items to the shopping cart by supplying a hashref containing the -required name/values or by passing in a newly create Handel::Cart::Item -object. If successful, C<add> will return a L<Handel::Cart::Item> object -reference. + my $numitems = $cart->count; -Yes, I know. Why a hashref and not just a hash? So I can add new params -later if need be. Oh yeah, and "Because I Can". :-P +=head2 delete =over -=item C<$cart-E<gt>add(\%data)> +=item Arguments: \%filter - my $item = $cart->add({ - shopper => '10020400-E260-11CF-AE68-00AA004A34D5', - sku => 'SKU1234', - quantity => 1, - price => 1.25 - }); +=back -=item C<$cart-E<gt>add($object)> +Deletes the item matching the supplied filter from the current cart. - my $item = Handel::Cart::Item->new({ - sku => 'SKU1234', - quantity => 1, - price => 1.25 + $cart->delete({ + sku => 'ABC-123' }); - ... - $cart->add($item); -A C<Handel::Exception::Argument> exception is thrown if the first parameter -isn't a hashref or a C<Handel::Cart::Item> object. +=head2 destroy + +=over + +=item Arguments: \%filter =back -=head2 Fetching Cart Items +Deletes entire shopping carts (and their items) from the database. When called +as an object method, this will delete all items from the current cart object +and deletes the cart object itself. C<filter> will be ignored. + + $cart->destroy; -You can retrieve all or some of the items contained in the cart via the C<items> -method. In a scalar context, items returns an iterator object which can be used -to cycle through items one at a time. In list context, it will return an array -containing all items. +When called as a class method, this will delete all carts matching C<filter>. + + Handel::Cart->destroy({ + shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' + }); + +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception will be +thrown if C<filter> is not a HASH reference. + +=head2 items =over -=item C<$cart-E<gt>items()> +=item Arguments: \%filter [, \%options] + +=back + +Loads the current carts items matching the specified filter and returns a +L<Handel::Iterator|Handel::Iterator> in scalar context, or a list of items in +list context. my $iterator = $cart->items; while (my $item = $iterator->next) { print $item->sku; }; - + my @items = $cart->items; - ... - dosomething(\@items); - -=item C<$cart-E<gt>items(\%filter [, $wantiterator])> -When filtering the items in the shopping cart in scalar context, a -C<Handel::Cart::Item> object will be returned if there is only one result. If -there are multiple results, a Handel::Iterator object will be returned -instead. You can force C<items> to always return a C<Handel::Iterator> object -even if only one item exists by setting the $wantiterator parameter to -C<RETURNAS_ITERATOR>. +By default, the items returned as Handel::Cart::Item objects. To return +something different, set C<item_class> in the local C<storage> object. - my $item = $cart->items({sku => 'SKU1234'}, RETURNAS_ITERATOR); - if ($item->isa('Handel::Cart::Item)) { - print $item->sku; - } else { - while ($item->next) { - print $_->sku; - }; - }; +The following options are available: -See the C<RETURNAS> constants in L<Handel::Constants> for other options. +=over -In list context, filtered items return an array of items just as when items is -called without a filter specified. +=item order_by - my @items - $cart->items((sku -> 'SKU1%'}); +Order the items by the column(s) and order specified. This option uses the SQL +style syntax: -A C<Handel::Exception::Argument> exception is thrown if parameter one isn't a -hashref or undef. + my $items = $cart->items(undef, {order_by => 'sku ASC'}); =back -=head2 Removing Cart Items +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if parameter one isn't a hashref or undef. -=over +=head2 search -=item C<$cart-E<gt>clear()> +=over -This method removes all items from the current cart object. +=item Arguments: \%filter [, \%options] - $cart->clear; - -=item C<$cart-E<gt>delete(\%filter)> +=back -This method deletes the cart item(s) matching the supplied filter values and -returns the number of items deleted. +Loads existing carts matching the specified filter and returns a +L<Handel::Iterator|Handel::Iterator> in scalar context, or a list of carts in +list context. - if ( $cart->delete({id => '8D4B0BE1-C02E-11D2-A33D-00A0C94B8D0E'}) ) { - print 'Item deleted'; + my $iterator = Handel::Cart->search({ + shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E', + type => CART_TYPE_SAVED + }); + + while (my $cart = $iterator->next) { + print $cart->id; }; + + my @carts = Handel::Cart->search(); -=back - -=head2 Removing the Entire Cart +The following options are available: =over -=item C<$cart-E<gt>destroy(\%filter)> +=item storage -=item C<Handel::Cart-E<gt>destroy(\%filter)> +A storage object to use to load cart objects. Currently, this storage +object B<must> have the same columns as the default storage object for the +current cart class. -When called used as an instance method, this will delete all items from the -current cart instance and delete the cart container. C<filter> will be ignored. +=item order_by -When called as a package method, this will delete all carts matching C<filter>. -A Handel::Exception::Argument exception will be thrown is C<filter> is not a -HASH reference. +Order the items by the column(s) and order specified. This option uses the SQL +style syntax: + + my $carts = Handel::Cart->search(undef, {order_by => 'name ASC'}); =back -=head2 Saving Your Cart +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if the first parameter is not a hashref. -By default every shopping cart created is considered temporary -(C<CART_TYPE_TEMP>) and could be deleted by cleanup processes at any time after -the defined inactivity period. This could also be considered characteristic of -whether the shopper id is from a temporary part of where it's used, or whether -it is generated and stored within a customer profile assigned during -authentication. +=head2 save -By saving your shopping cart, you are marking it as C<CART_TYPE_SAVED> and it -should be left alone by any cleanup processes and available to that shopper at -any time. +Marks the current shopping cart type as C<CART_TYPE_SAVED>. -For all intents and purposes, a saved cart is a wishlist. At some point in the -future they may be treated differently. + $cart->save -=over +=head2 restore -=item C<$cart-E<gt>save()> +=over -=back +=item Arguments: \%filter [, $mode] -=head2 Restoring A Previously Saved Cart +=item Arguments: $cart [, $mode] -There are two basic ways to restore a previously saved shopping cart into the -current shopping cart object. You may either pass in a hashref containing the -search criteria of the shopping cart(s) to restore or you can pass in an -existing C<Handel::Cart> object. +=back -=over +Copies (restores) items from a cart, or a set of carts back into the current +shopping cart. You may either pass in a hash reference containing the search +criteria of the shopping cart(s) to restore: -=item C<$cart-E<gt>restore(\%search, [$mode])> + $cart->restore({ + shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E', + type => CART_TYPE_SAVED + }); -=item C<$cart-E<gt>restore($object, [$mode])> +or you can pass in an existing C<Handel::Cart> object or subclass. -=back + my $wishlist = Handel::Cart->search({ + id => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E', + type => CART_TYPE_SAVED + })->first; + + $cart->restore($wishlist); For either method, you may also specify the mode in which the cart should be -restored. $mode can be one of the following: +restored. The following modes are available: =over @@ -561,7 +527,7 @@ into it. This is the default if no mode is specified. If an item with the same SKU exists in both the current cart and the saved cart, the quantity of each will be added together and applied to the same sku in the current cart. Any price differences are ignored and we assume that the price in -the current cart is more up to date. +the current cart has the more up to date price. =item C<CART_MODE_APPEND> @@ -569,53 +535,57 @@ All items in the saved cart will be appended to the list of items in the current cart. No effort will be made to merge items with the same SKU and duplicates will be ignored. -A C<Handel::Exception::Argument> exception is thrown if the first parameter -isn't a hashref or a C<Handel::Cart> object. +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if the first parameter isn't a hashref or a C<Handel::Cart::Item> object +or subclass. =back -=head2 Misc. Methods +=head1 COLUMNS -=over +The following methods are mapped to columns in the default cart schema. These +methods may or may not be available in any subclasses, or in situations where +a custom schema is being used that has different column names. -=item C<$cart-E<gt>count()> +=head2 id -Returns the number of items in the cart object. +Returns the id of the current cart. - my $numitems = $cart->count; + print $cart->id; -=item C<$cart-E<gt>description([$description])> +See L<Handel::Schema::Cart/id> for more information about this column. -Returns/sets the description of the current cart. +=head2 shopper -=item C<$cart-E<gt>name([$name])> +=over -Returns/set the name of the current cart. +=item Arguments: $shopper -=item C<$cart-E<gt>subtotal()> +=back -Returns the current total price of all the items in the cart object. This is -equivalent to: +Gets/sets the id of the shopper the cart should be associated with. - my $iterator = $cart->items; - while (my $item = $iterator->next) { - $subtotal += $item->quantity*$item->price; - }; + $cart->shopper('11111111-1111-1111-1111-111111111111'); + print $cart->shopper; -Starting in version C<0.12>, C<subtotal> now returns a stringified L<Handel::Currency> -object. This can be used to format the price, and hopefully to convert it's currency -to another locale in the future. +See L<Handel::Schema::Cart/shopper> for more information about this column. -=item C<$cart-E<gt>type()> +=head2 type -Returns the type of the current cart. Currently the two types are +=over + +=item Arguments: $type + +=back + +Gets/sets the type of the current cart. Currently the two types allowed are: =over =item C<CART_TYPE_TEMP> -The cart is temporary and may be purges during any cleanup process after the -designated amount of inactivity. +The cart is temporary and may be purged during any [external] cleanup process +after the designated amount of inactivity. =item C<CART_TYPE_SAVED> @@ -624,11 +594,55 @@ shopper at any time. =back + $cart->type(CART_TYPE_SAVED); + print $cart->type; + +See L<Handel::Schema::Cart/type> for more information about this column. + +=head2 name + +=over + +=item Arguments: $name + +=back + +Gets/sets the name of the current cart. + + $cart->name('My Naw Cart'); + print $cart->name; + +See L<Handel::Schema::Cart/name> for more information about this column. + +=head2 description + +=over + +=item Arguments: $description + =back +Gets/sets the description of the current cart. + + $cart->description('New Cart'); + print $cart->description; + +See L<Handel::Schema::Cart/description> for more information about this column. + +=head2 subtotal + +Returns the current total price of all the items in the cart object as a +stringified L<Handel::Currency|Handel::Currency> object. This is equivalent to: + + my $iterator = $cart->items; + my $subtotal = 0; + while (my $item = $iterator->next) { + $subtotal += $item->quantity*$item->price; + }; + =head1 SEE ALSO -L<Handel::Constants> +L<Handel::Cart::Item>, L<Handel::Schema::Cart>, L<Handel::Constants> =head1 AUTHOR lib/Handel/Cart.pm @@ -4,40 +4,36 @@ use strict; use warnings; BEGIN { - use base 'Handel::DBI'; - use Handel::Constraints qw(:all); - use Handel::Currency; - use Handel::L10N qw(translate); -}; + use base qw/Handel::Base/; + use Handel::L10N qw/translate/; -__PACKAGE__->table('cart_items'); -__PACKAGE__->autoupdate(1); -__PACKAGE__->iterator_class('Handel::Iterator'); -__PACKAGE__->columns(All => qw(id cart sku quantity price description)); -__PACKAGE__->columns(Essential => qw(id cart sku quantity price description)); -__PACKAGE__->has_a(price => 'Handel::Currency'); -__PACKAGE__->add_constraint('quantity', quantity => \&constraint_quantity); -__PACKAGE__->add_constraint('price', price => \&constraint_price); -__PACKAGE__->add_constraint('id', id => \&constraint_uuid); -__PACKAGE__->add_constraint('cart', cart => \&constraint_uuid); + __PACKAGE__->storage_class('Handel::Storage::DBIC::Cart::Item'); + __PACKAGE__->create_accessors; +}; -sub new { - my ($self, $data) = @_; +sub create { + my ($self, $data, $opts) = @_; throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($data) eq 'HASH'; + translate('PARAM1_NOT_HASHREF') + ) unless ref($data) eq 'HASH'; ## no critic - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; - return $self->construct($data); + return $self->create_instance( + $storage->create($data) + ); }; sub total { my $self = shift; - return Handel::Currency->new($self->quantity * $self->price); + my $storage = $self->result->storage; + + return $storage->currency_class->new($self->quantity * $self->price); }; 1; @@ -45,37 +41,38 @@ __END__ =head1 NAME -Handel::Cart::Item - Module representing an individual shopping cart line item +Handel::Cart::Item - Module representing an individual shopping cart item =head1 SYNOPSIS use Handel::Cart::Item; - - my $item = Handel::Cart::Item->new({ - sku => '1234', - price => 1.23, + + my $item = Handel::Cart::Item->create({ + cart => '11111111-1111-1111-1111-111111111111', + sku => '1234', + price => 1.23, quantity => 1 }); - $cart->add($item); - =head1 DESCRIPTION -C<Handel::Cart::Item> is used in two main ways. First, you can create new line -items and add them to an existing cart object: +Handel::Cart::Item is used in two main ways. First, you can create or edit cart +items individually: use Handel::Cart::Item; - - my $item = Handel::Cart::Item->new({ + + my $item = Handel::Cart::Item->create({ + cart => '11111111-1111-1111-1111-111111111111', sku => '1234', price => 1.23, quantity => 1 }); - $cart->add($item); +As a general rule, you probably want to add/edit items using the cart objects +C<items> and C<add> methods below instead. -Second, the C<items> method of any valid C<Handel::Cart> object returns a -collection of C<Handel::Cart::Item> objects: +Second, the C<items> method of any valid Handel::Cart object returns a +collection of Handel::Cart::Item objects: my @items = $cart->items; foreach (@items) { @@ -84,57 +81,143 @@ collection of C<Handel::Cart::Item> objects: =head1 CONSTRUCTOR -=head2 new +=head2 create + +=over + +=item Arguments: \%data [, \%options] + +=back -You can create a new C<Handel::Cart::Item> object by calling the C<new> method: +You can create a new Handel::Cart::Item object by calling the C<new> method: - my $item = Handel::Cart::Item->new({ + my $item = Handel::Cart::Item->create({ + cart => '11111111-1111-1111-1111-111111111111', sku => '1234', price => 1.23, quantity => 1 }); - + $item->quantity(2); - + print $item->total; -This is a lazy operation. No actual item record is created until the item object -is passed into the C<add> method of a C<Handel::Cart> object. +The following options are available: + +=over -=head1 METHODS +=item storage + +A storage object to use to create a new item object. Currently, this storage +object B<must> have the same columns as the default storage object for the +current item class. + +=back + +=head1 COLUMNS + +The following methods are mapped to columns in the default cart schema. +These methods may or may not be available in any subclasses, or in situations +where a custom schema is being used that has different column names. + +=head2 id + +Returns the id of the current cart item. + + print $item->id; + +See L<Handel::Schema::Cart::Item/id> for more information about this column. + +=head2 cart + +Gets/sets the id of the cart this item belongs to. + + $item->cart('11111111-1111-1111-1111-111111111111'); + print $item->cart; + +See L<Handel::Schema::Cart::Item/cart> for more information about this column. =head2 sku -Returns or sets the sku (stock keeping unit/part number) for the cart item. +=over + +=item Arguments: $sku + +=back + +Gets/sets the sku (stock keeping unit/part number) for the cart item. + + $item->sku('ABC123'); + print $item->sku; + +See L<Handel::Schema::Cart::Item/sku> for more information about this column. =head2 quantity -Returns or sets the quantity the cart item. +=over + +=item Arguments: $quantity + +=back + +Gets/sets the quantity, or the number of this item being purchased. + + $item->quantity(3); + print $item->quantity; + +By default, the value supplied will be checked against +L<Handel::Constraints/constraint_quantity> to verify it is within the valid +range of values. + +See L<Handel::Schema::Cart::Item/quantity> for more information about this +column. =head2 price -Returns or sets the price for the cart item. +=over + +=item Arguments: $price + +=back + +Gets/sets the price for the cart item. The price is returned as a stringified +L<Handel::Currency|Handel::Currency> object. -Starting in version C<0.12>, price now returns a stringified -C<Handel::Currency> object. This can be used to format the price, -and convert its value from on currency to another. + $item->price(12.95); + print $item->price; + print $item->price->format; + + +See L<Handel::Schema::Cart::Item/price> for more information about this column. =head2 total -Returns the total price for the cart item. This is really just +Returns the total price for the cart item as a stringified +L<Handel::Currency|Handel::Currency> object. This is really just quantity*total and is provided for convenience. -Starting in version C<0.12>, subtotal now returns a stringified -C<Handel::Currency> object. This can be used to format the price, -and convert its value from on currency to another. + print $item->total; + print $item->total->format; =head2 description -Returns or sets the description for the cart item. +=over + +=item Arguments: $description + +=back + +Gets/sets the description for the current cart item. + + $item->description('Best Item Ever'); + print $item->description; + +See L<Handel::Schema::Cart::Item/description> for more information about this +column. =head1 SEE ALSO -L<Handel::Cart>, L<Handel::Currency> +L<Handel::Cart>, L<Handel::Schema::Cart::Item>, L<Handel::Currency> =head1 AUTHOR @@ -142,8 +225,3 @@ L<Handel::Cart>, L<Handel::Currency> CPAN ID: CLACO claco@chrislaco.com http://today.icantfocus.com/blog/ - - - - - lib/Handel/Cart/Item.pm @@ -5,21 +5,23 @@ use warnings; BEGIN { use Handel; - use Handel::Cart; - use Handel::Checkout::Stash; - use Handel::Constants qw(:checkout :returnas); - use Handel::Constraints qw(constraint_checkout_phase constraint_uuid); - use Handel::Exception qw(:try); + use Handel::Constants qw/:all/; + use Handel::Constraints qw/constraint_checkout_phase constraint_uuid/; + use Handel::Exception qw/try with otherwise finally/; use Handel::Checkout::Message; - use Handel::L10N qw(translate); - use Handel::Order; - use Module::Pluggable 2.95 instantiate => 'new', sub_name => '_plugins'; - use base qw(Class::Data::Inheritable); - - __PACKAGE__->mk_classdata(_order_class => 'Handel::Order'); - __PACKAGE__->mk_classdata(_stash_class => 'Handel::Checkout::Stash'); + use Handel::L10N qw/translate/; + use Module::Pluggable::Object; + use Class::Inspector; + use Scalar::Util qw/blessed/; + + use base qw/Class::Accessor::Grouped/; + __PACKAGE__->mk_group_accessors('component_class', qw/order_class stash_class/); + __PACKAGE__->mk_group_accessors('simple', qw/stash/); }; +__PACKAGE__->order_class('Handel::Order'); +__PACKAGE__->stash_class('Handel::Checkout::Stash'); + sub new { my $class = shift; my $opts = shift || {}; @@ -27,22 +29,39 @@ sub new { plugins => [], handlers => {}, phases => [], - messages => [], - stash => $opts->{'stash'} || $class->stash_class->new - }, ref $class || $class; + messages => [] + }, $class; + + my $stash = $opts->{'stash'}; - $self->_set_search_path($opts); + if (blessed $stash) { + $self->stash($stash); + } elsif (ref $stash eq 'HASH') { + $self->stash( + $self->stash_class->new($stash) + ); + } else { + $self->stash( + $self->stash_class->new + ); + }; - foreach ($self->_plugins($self)) { - if (UNIVERSAL::isa($_, 'Handel::Checkout::Plugin')) { + foreach ($self->load_plugins($opts)) { + if (blessed($_) && $_->isa('Handel::Checkout::Plugin')) { push @{$self->{'plugins'}}, $_; $_->register($self); }; }; - $self->cart($opts->{'cart'}) if $opts->{'cart'}; - $self->order($opts->{'order'}) if $opts->{'order'}; - $self->phases($opts->{'phases'}) if $opts->{'phases'}; + if ($opts->{'cart'}) { + $self->cart($opts->{'cart'}); + }; + if ($opts->{'order'}) { + $self->order($opts->{'order'}); + }; + if ($opts->{'phases'}) { + $self->phases($opts->{'phases'}); + }; return $self; }; @@ -58,14 +77,12 @@ sub add_handler { my ($package) = caller; throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not a a valid CHECKOUT_PHASE_* value') . '.') - unless constraint_checkout_phase($phase); + translate('PARAM1_NOT_CHECKOUT_PHASE') + ) unless constraint_checkout_phase($phase); ## no critic throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not a CODE reference') . '.') - unless ref($ref) eq 'CODE'; + translate('PARAM1_NOT_CODEREF') + ) unless ref($ref) eq 'CODE'; ## no critic foreach (@{$self->{'plugins'}}) { if (ref $_ eq $package) { @@ -74,26 +91,29 @@ sub add_handler { my $plugin = $self->{'handlers'}->{$phase}->{$preference}->[0]; throw Handel::Exception::Checkout( -details => - translate("There is already a handler in phase ([_1]) for preference ([_2]) from the plugin ([_3])", $phase, $preference, $plugin) . '.') + translate('HANDLER_EXISTS_IN_PHASE', $phase, $preference, $plugin) + ); }; } else { - my @prefs = sort {$a <=> $b} keys %{$self->{'handlers'}->{'$phase'}}; + my @prefs = sort {$a <=> $b} keys %{$self->{'handlers'}->{$phase}}; $preference = scalar @prefs ? $#prefs++ : 101; }; $self->{'handlers'}->{$phase}->{$preference} = [$_, $ref]; last; }; }; + + return; }; sub add_message { my ($self, $message) = @_; my ($package, $filename, $line) = caller; - if (ref $message && UNIVERSAL::isa($message, 'Handel::Checkout::Message')) { - $message->package($package) unless $message->package; - $message->filename($filename) unless $message->filename; - $message->line($line) unless $message->line; + if (blessed($message) && $message->isa('Handel::Checkout::Message')) { + $message->package($package) unless $message->package; ## no critic + $message->filename($filename) unless $message->filename; ## no critic + $message->line($line) unless $message->line; ## no critic push @{$self->{'messages'}}, $message; } elsif (!ref $message || ref $message eq 'Apache::AxKit::Exception::Error') { @@ -101,8 +121,11 @@ sub add_message { text => $message, source => $package, filename => $filename, line => $line); } else { throw Handel::Exception::Argument( -details => - translate('Param 1 is not a Handel::Checkout::Message object or text message') . '.'); + translate('PARAM1_NOT_CHECKOUT_MESSAGE') + ); }; + + return; }; sub add_phase { @@ -111,15 +134,15 @@ sub add_phase { if (Handel::Constants->can($name)) { throw Handel::Exception::Constraint( - -text => translate("A constant named '$name' already exists in Handel::Constants") + -text => translate('CONSTANT_NAME_ALREADY_EXISTS', $name) ); } elsif (constraint_checkout_phase($value)) { throw Handel::Exception::Constraint( - -text => translate("A phase constant value of '$value' already exists") + -text => translate('CONSTANT_VALUE_ALREADY_EXISTS', $value) ); } elsif ($import && main->can($name)) { throw Handel::Exception::Constraint( - -text => translate("A constant named '$name' already exists in caller '$caller'") + -text => translate('CONSTANT_EXISTS_IN_CALLER', $name, $caller) ); } else { my $sub = sub {return $value}; @@ -133,25 +156,26 @@ sub add_phase { push @Handel::Constants::CHECKOUT_ALL_PHASES, $value; }; + + return; }; sub clear_messages { my $self = shift; $self->{'messages'} = []; + + return; }; sub cart { my ($self, $cart) = @_; if ($cart) { - if (ref $cart eq 'HASH' || UNIVERSAL::isa($cart, 'Handel::Cart') || constraint_uuid($cart)) { - $self->order($self->order_class->new({cart => $cart})); - } else { - throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference, Handel::Cart object, or cart id') . '.'); - }; + $self->order($self->order_class->create({cart => $cart})); }; + + return; }; sub messages { @@ -160,34 +184,32 @@ sub messages { return wantarray ? @{$self->{'messages'}} : $self->{'messages'}; }; -sub order_class { - my ($self, $order_class) = @_; - - if ($order_class) { - eval "require $order_class"; - $self->_order_class($order_class); - }; - - return $self->_order_class; -}; - sub order { my ($self, $order) = @_; if ($order) { if (ref $order eq 'HASH') { - $self->{'order'} = $self->order_class->load($order, RETURNAS_ITERATOR)->first; - } elsif (UNIVERSAL::isa($order, 'Handel::Order')) { + $self->{'order'} = $self->order_class->search($order)->first; + } elsif (blessed($order) && $order->isa('Handel::Order')) { $self->{'order'} = $order; - } elsif (constraint_uuid($order)) { - $self->{'order'} = $self->order_class->load({id => $order}); + } elsif (!ref $order) { + my ($primary_key) = $self->order_class->storage->primary_columns; + + $self->{'order'} = $self->order_class->search({$primary_key => $order})->first; } else { throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference, Handel::Order object, or order id') . '.'); - } - } else { - return $self->{'order'}; + translate('PARAM1_NOT_HASHREF_ORDER') + ); + }; + + if (!$self->order) { + throw Handel::Exception::Checkout( -details => + translate('ORDER_NOT_FOUND') + ); + }; }; + + return $self->{'order'}; }; sub phases { @@ -195,7 +217,8 @@ sub phases { if ($phases) { throw Handel::Exception::Argument( -details => - translate('Param 1 is not an ARRAY reference or string') . '.') unless (ref($phases) eq 'ARRAY' || !ref($phases)); + translate('PARAM1_NOT_ARRAYREF_STRING') + ) unless (ref($phases) eq 'ARRAY' || !ref($phases)); ## no critic if (! ref $phases) { # holy crap, that actually worked! @@ -205,11 +228,13 @@ sub phases { $self->{'phases'} = $phases; } else { if (wantarray) { - return (scalar @{$self->{'phases'}}) ? @{$self->{'phases'}} : @{&CHECKOUT_DEFAULT_PHASES}; + return (scalar @{$self->{'phases'}}) ? @{$self->{'phases'}} : @{&CHECKOUT_DEFAULT_PHASES}; ## no critic } else { - return (scalar @{$self->{'phases'}}) ? $self->{'phases'} : &CHECKOUT_DEFAULT_PHASES; + return (scalar @{$self->{'phases'}}) ? $self->{'phases'} : CHECKOUT_DEFAULT_PHASES; }; }; + + return; }; sub process { @@ -218,27 +243,26 @@ sub process { if ($phases) { throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not an ARRAY reference or string') . '.') - unless (ref($phases) eq 'ARRAY' || ! ref($phases)); + translate('PARAM1_NOT_ARRAYREF_STRING') + ) unless (ref($phases) eq 'ARRAY' || ! ref($phases)); ## no critic if (! ref $phases) { # holy crap, that actually worked! $phases = [map(eval "$_", _path_to_array($phases))]; }; } else { - $phases = $self->{'phases'} || CHECKOUT_DEFAULT_PHASES; + $phases = scalar @{$self->{'phases'}} ? $self->{'phases'} : CHECKOUT_DEFAULT_PHASES; }; throw Handel::Exception::Checkout( -details => - translate('No order is assocated with this checkout process') . '.') - unless $self->order; + translate('NO_ORDER_LOADED') + ) unless $self->order; ## no critic $self->stash->clear; $self->_setup($self); { - local $self->order->db_Main->{AutoCommit}; + $self->order->result->txn_begin; foreach my $phase (@{$phases}) { next unless $phase; @@ -251,9 +275,14 @@ sub process { if ($status != CHECKOUT_HANDLER_OK && $status != CHECKOUT_HANDLER_DECLINE) { $self->_teardown($self); - eval {$self->order->dbi_rollback}; - if ($@) { - throw Handel::Exception(-details => "Transaction aborted. Rollback failed: $@"); + try { + $self->order->result->txn_rollback; + $self->order->result->discard_changes; + foreach my $item ($self->order->items->all) { + $item->result->discard_changes; + }; + } otherwise { + throw Handel::Exception::Checkout(-details => translate('ROLLBACK_FAILED', shift)); }; return CHECKOUT_STATUS_ERROR; @@ -261,7 +290,7 @@ sub process { }; }; - $self->order->dbi_commit; + $self->order->result->txn_commit; }; $self->_teardown($self); @@ -269,33 +298,16 @@ sub process { return CHECKOUT_STATUS_OK; }; -sub stash_class { - my ($self, $stash_class) = @_; - - if ($stash_class) { - eval "require $stash_class"; - $self->_stash_class($stash_class); - }; - - return $self->_stash_class; -}; - -sub stash { - my $self = shift; - - return $self->{'stash'}; -}; - sub _setup { my $self = shift; foreach (@{$self->{'plugins'}}) { try { $_->setup($self); - } otherwise { - warn shift->text; }; }; + + return; }; sub _teardown { @@ -304,15 +316,17 @@ sub _teardown { foreach (@{$self->{'plugins'}}) { try { $_->teardown($self); - } otherwise { - warn shift->text; }; }; + + return; }; -sub _set_search_path { +sub load_plugins { my ($self, $opts) = @_; - my $config = $Handel::Cfg; + my ($package, $file) = caller; + my $config = Handel->config; + my $search_path; my $pluginpaths = ref $opts->{'pluginpaths'} eq 'ARRAY' ? join(' ', @{$opts->{'pluginpaths'}}) : $opts->{'pluginpaths'} || ''; @@ -321,32 +335,35 @@ sub _set_search_path { join(' ', @{$opts->{'addpluginpaths'}}) : $opts->{'addpluginpaths'} || '' ; if ($pluginpaths) { - $self->search_path(new => _path_to_array($pluginpaths)); + $search_path = [_path_to_array($pluginpaths)]; } elsif (my $path = $config->{'HandelPluginPaths'}) { - $self->search_path(new => _path_to_array($path)); + $search_path = [_path_to_array($path)]; } elsif ($path = $config->{'HandelAddPluginPaths'} || $addpluginpaths) { - $self->search_path(new => 'Handel::Checkout::Plugin', _path_to_array("$path $addpluginpaths")); + $search_path = ["$package\:\:Plugin", _path_to_array("$path $addpluginpaths")]; + } else { + $search_path = ["$package\:\:Plugin"]; }; - ## reset these crazy things - $self->except([]); - $self->only([]); - my $ignore = $opts->{'ignoreplugins'} || $config->{'HandelIgnorePlugins'}; - if (ref $ignore eq 'Regexp' || ref $ignore eq 'ARRAY') { - $self->except($ignore); - } elsif ($ignore) { - $self->except([_path_to_array($ignore)]); + if (ref $ignore ne 'Regexp' && ref $ignore ne 'ARRAY' && $ignore) { + $ignore = [_path_to_array($ignore)]; }; my $only = $opts->{'loadplugins'} || $config->{'HandelLoadPlugins'}; - if (ref $only eq 'Regexp' || ref $only eq 'ARRAY') { - $self->only($only); - } elsif ($only) { - $self->only([_path_to_array($only)]); + if (ref $only ne 'Regexp' && ref $only ne 'ARRAY' && $only) { + $only = [_path_to_array($only)]; }; - return undef; + my $finder = Module::Pluggable::Object->new( + instantiate => 'new', + package => $package, + file => $file, + search_path => $search_path, + except => $ignore, + only => $only + ); + + return $finder->plugins; }; sub _path_to_array { @@ -360,6 +377,30 @@ sub _path_to_array { return split /\s+/, $path; }; +sub get_component_class { + my ($self, $field) = @_; + + return $self->get_inherited($field); +}; + +sub set_component_class { + my ($self, $field, $value) = @_; + + if ($value) { + if (!Class::Inspector->loaded($value)) { + eval "require $value"; ## no critic + + throw Handel::Exception::Checkout( + -details => translate('COMPCLASS_NOT_LOADED', $field, $value) + ) if $@; ## no critic + }; + }; + + $self->set_inherited($field, $value); + + return; +}; + 1; __END__ @@ -370,12 +411,14 @@ Handel::Checkout - Checkout Pipeline Processor =head1 SYNOPSIS use Handel::Checkout; - + use strict; + use warnings; + my $checkout = Handel::Checkout->new({ cart => '122345678-9098-7654-3212-345678909876', phases => [CHECKOUT_PHASE_INITIALIZE, CHECKOUT_PHASE_VALIDATE] }); - + if ($checkout->process == CHECKOUT_STATUS_OK) { print 'Your order number is ', $checkout->order->number; } else { @@ -392,31 +435,41 @@ allowing the checkout process to be customized for many different needs. =head1 CONSTRUCTOR -=head2 new([\%options]) +=head2 new + +=over -Creates a new checkout pipeline process and loads all available plugins. -C<new> accepts the following options in an optional HASH reference: +=item Arguments: \%options + +=back + +Creates a new checkout pipeline process and loads all available plugins in the +default plugin namespace (Handel::Checkout::Plugin). C<new> accepts the +following options in an optional HASH reference: =over =item cart -A HASH reference, Handel::Cart object, or a cart id. This will be loaded -into a new Handel::Order object and associated with the new checkout -process. +A HASH reference, a class object, or a cart primary key value. This will be +loaded into a new order object and associated with the new checkout +process. By default, a Handel::Order object will be create unless you have +set C<order_class> to another class. See C<cart> below for further details about the various values allowed to be passed. B<Note>: When creating a new order via Handel::Order, C<new> will automatically -create a checkout process and process the C<CHECKOUT_PHASE_INITIALIZE>. +create a checkout process and process the C<CHECKOUT_PHASE_INITIALIZE> phase. However, when a new order is created using C<cart> in Handel::Checkout, the automatic processing of C<CHECKOUT_PHASE_INITIALIZE> is disabled. =item order -A HASH reference, Handel::Order object, or an order id. This will be loaded -and associated with the new checkout process. +A HASH reference, an order object, or an order primary key value. This will be +loaded and associated with the new checkout process. By default, a Handel::Order +object will be create when you pass in an order id unless you have set +C<order_class> to another class. See C<order> below for further details about the various values allowed to be passed. @@ -425,17 +478,17 @@ to be passed. An array reference or a comma (or space) separated list containing the various namespaces of plugins to be loaded. This will override any settings in -C<ENV> or F<httpd.conf> for the current checkout instance only. +C<ENV> or F<httpd.conf> for the current checkout object only. my $checkout = Handel::Checkout->new({ pluginpaths => [MyNamespace::Plugins, Other::Plugin] }); - + my $checkout = Handel::Checkout->new({ pluginpaths => 'MyNamespace::Plugins, Other::Plugin' }); -See L<"HandelPluginPaths"> for more information about settings/resetting +See L</HandelPluginPaths> for more information about settings/resetting plugin search paths. =item addpluginpaths @@ -447,12 +500,12 @@ If C<HandelAddPluginPaths> is also specified, the two will be combined. my $checkout = Handel::Checkout->new({ addpluginpaths => [MyNamespace::Plugins, Other::Plugin] }); - + my $checkout = Handel::Checkout->new({ addpluginpaths => 'MyNamespace::Plugins, Other::Plugin' }); -See L<"HandelAddPluginPaths"> for more information about settings/resetting +See L</HandelAddPluginPaths> for more information about settings/resetting plugin search paths. =item loadplugins @@ -460,7 +513,7 @@ plugin search paths. An array reference or a comma (or space) separated list containing the names of the specific plugins to load in the current plugin paths. -See L<"HandelLoadPlugins"> for more information about loading specific +See L</HandelLoadPlugins> for more information about loading specific plugins. =item ignoreplugins @@ -469,7 +522,7 @@ An array reference or a comma (or space) separated list containing the names of the specific plugins to be ignored (not loaded) in the current plugin paths. -See L<"HandelIgnorePlugins"> for more information about ignore specific +See L</HandelIgnorePlugins> for more information about ignore specific plugins. =item phases @@ -478,35 +531,49 @@ An array reference or a comma (or space) separated list containing the various phases to be executed. my $checkout = Handel::Checkout->new({ - phases => [CHECKOUT_PHASE_VALIDATION, - CHECKOUT_PHASE_AUTHORIZATION] + phases => [CHECKOUT_PHASE_VALIDATE, + CHECKOUT_PHASE_AUTHORIZE] }); - + my $checkout = Handel::Checkout->new({ - phases => 'CHECKOUT_PHASE_VALIDATION, CHECKOUT_PHASE_AUTHORIZATION' + phases => 'CHECKOUT_PHASE_VALIDATE, CHECKOUT_PHASE_AUTHORIZE' }); =item stash -A Handel::Checkout::Stash instance of subclass instance. If nothing is specified, -$self->stash_class will be used instead. +A Handel::Checkout::Stash object, subclass or a hash reference. If nothing is +specified, C<stash_class> will be used instead. + + my $checkout = Handel::Checkout->new({ + stash => { key => 'value' } + }); + + my $checkout = Handel::Checkout->new({ + stash => $stash + }); =back =head1 METHODS -=head2 add_handler($phase, \&coderef, $preference) +=head2 add_handler + +=over + +=item Arguments: $phase, \&coderef, $preference -Registers a code reference with the checkout phase specified and assigned a run +=back + +Registers a code reference with the checkout phase specified and assigns a run order preference. This is usually called within C<register> on the current -checkout context: +checkout context within a plugin: sub register { my ($self, $ctx) = @_; $ctx->add_handler(CHECKOUT_PHASE_DELIVER, \&myhandler, 200); }; - + sub myhandler { ... }; @@ -517,11 +584,17 @@ list after all other handlers in that phase. If there is already a handler in the specified phase with the same preference, a Handel::Exception::Checkout exception will be thrown. -While not enforced, please keep your handler preference orders between 251 - 749. -Preference orders 1-250 and 750-1000 will be reserved for core modules that need -to run before or after all other plugin handlers. +While not enforced, please keep your handler preference orders between +251 - 749. Preference orders 1-250 and 750-1000 will be reserved for core +modules that need to run before or after all other plugin handlers. + +=head2 add_message + +=over + +=item Arguments: $message -=head2 add_message($message) +=back Adds a new text message or Handel::Checkout::Message based object to the message stack so plugins can log their issues for later inspection. @@ -530,7 +603,7 @@ to the message stack so plugins can log their issues for later inspection. my ($self, $ctx) = @_; ... $ctx->add_message('Skipping phase for countries other than US...'); - + return CHECKOUT_HANDLER_DECLINE; }; @@ -539,34 +612,46 @@ If your adding a simple text message, a new Handel::Checkout::Message object will automatically be created and C<package>, C<filename>, and C<line> properties will be set. -=head2 add_phase($name, $value [, $import]); +=head2 add_phase + +=over + +=item Arguments: $name, $value [, $import] + +=back Adds a new constant/sub named $name to Handel::Constant and adds the $value to -CHECKOUT_ALL_PHASES. The new phase will be accepted by &constraint_checkout_phase -and can be used by checkout plugins registering their handlers via -add_handler($phase, &handler). If $import is true, add_phase will register the -constant in the local namespace just as if it you had specified it in your use -statement. +CHECKOUT_ALL_PHASES. The new phase will be accepted by +C<constraint_checkout_phase> and can be used by checkout plugins registering +their handlers via add_handler($phase, &handler). If $import is true, +C<add_phase> will register the constant in the local namespace just as if it +you had specified it in your use statement. use Handel::Checkout; - + Handel::Checkout->add_phase('CHECKOUT_PHASE_CUSTOMPHASE', 42, 1); - + print constraint_checkout_phase(&CHECKOUT_PHASE_CUSTOMPHASE); - - $plugincontext->add_handler(Handel::Constants::CHECKOUT_PHASE_CUSTOMPHASE, &handlersub); + + $plugincontext->add_handler( + Handel::Constants::CHECKOUT_PHASE_CUSTOMPHASE, &handlersub + ); =head2 clear_messages -Clears all messages from the current checkout instance. +Clears all messages from the current checkout object. =head2 cart -Creates a new Handel::Order object from the specified cart and associates +Creates a new order object from the specified cart and associates that order with the current checkout process. This is typically only needed the first time you want to run checkout for a specific cart. From then on, you only need to load the already created order using C<order> below. +By default, a Handel::Order object will be create unless you have +set C<order_class> to another class. When the order class loads a cart by id, it +will create a cart using the C<cart_class> set in the C<order_class>. + C<cart> can accept one of three possible parameter values: =over @@ -574,67 +659,83 @@ C<cart> can accept one of three possible parameter values: =item cart(\%filter) When you pass a HASH reference, C<cart> will attempt to load all available -carts using Handel::Cart::load(\%filter). If multiple carts are found, only -the first one will be used. +carts. If multiple carts are found, only the first one will be used. $checkout->cart({ shopper => '12345678-9098-7654-3212-345678909876', type => CART_TYPE_TEMP }); -=item cart(Handel::Cart) +=item cart($cart) You can also pass in an already existing Handel::Cart object or subclass. It -will then be loaded into a new order object ans associated with the current +will then be loaded into a new order object and associated with the current checkout process. - my $cart = Handel::Cart->load({ + my $cart = Handel::Cart->search({ id => '12345678-9098-7654-3212-345678909876' - }); - + })->first; + $checkout->cart($cart); -=item cart($cartid) +=item cart('11111111-1111-1111-1111-111111111111') -Finally, you can pass a valid cart/uuid into C<cart>. The matching cart -will be loaded into a new Handel::Order object and associated with the -current checkout process. +Finally, you can pass a valid cart/uuid into C<cart>. The matching cart will be +loaded into a new order object and associated with the current checkout +process. $checkout->cart('12345678-9098-7654-3212-345678909876'); =back -=head2 order_class($orderclass) +=head2 order_class -Gets/Sets the name of the class to use when loading existing order into the -checkout process. By default, it loads order using Handel::Order. While you can -set this directly in your application, it's best to set it in a custom subclass -of Handel::Checkout. +=over + +=item Arguments: $order_class + +=back + +Gets/sets the name of the class to use when loading an existing order into the +checkout process or when creating a new order from an existing cart. By default, +it loads order using Handel::Order. While you can set this directly in your +application, it's best to set it in a custom subclass of Handel::Checkout. package CustomCheckout; - use base 'Handel::Checkout'; + use strict; + use warnings; + use base qw/Handel::Checkout/; __PACKAGE__->order_class('CustomOrder'); - + ... use CustomCheckout; - my $checkout = CustomCheckout->new({order => '11111111-2222-3333-4444-555555555555'}); - + my $checkout = CustomCheckout->new({ + order => '11111111-2222-3333-4444-555555555555' + }); + print ref $checkout->order; # CustomOrder -=head2 stash_class($stashclass) +=head2 stash_class + +=over -Gets/Sets the name of the stash class to create during C<new>. By default, it -returns Handel::Checkout::Stash. While you can -set this directly in your application, it's best to set it in a custom subclass -of Handel::Checkout. +=item Arguments: $stash_class + +=back + +Gets/sets the name of the stash class to create during C<new>. By default, it +returns Handel::Checkout::Stash. While you can set this directly in your +application, it's best to set it in a custom subclass of Handel::Checkout. package CustomCheckout; - use base 'Handel::Checkout'; + use strict; + use warnings; + use base qw/Handel::Checkout/; __PACKAGE__->stash_class('MyCustomStash'); =head2 messages -Returns a reference to an array in list context of Handel::Checkout::Message +Returns a reference to an array in scalar context of Handel::Checkout::Message objects containing additional information about plugin and other checkout decisions and activities. Returns a list in list context. @@ -642,13 +743,26 @@ decisions and activities. Returns a list in list context. warn $_->text, "\n"; }; +=head2 load_plugins + +=over + +=item Arguments: \%options + +=back + +Returns a list of plugins pre-instantiated that match the options specified. +The plugins returned are not yet registered. + +See L</new> for the available plugin/plugin path options. + =head2 plugins -Returns a list plugins loaded for checkout instance in list context: +Returns a list plugins loaded for current checkout object in list context: my $checkout = Handel::Checkout->new; my @plugins = $checkout->plugins; - + foreach (@plugins) { $_->cleanup_or_something; }; @@ -657,7 +771,9 @@ Returns an array reference in scalar context. =head2 order -Gets/Sets an existing Handel::Order object with the existing checkout process. +Gets/sets an existing order object with the existing checkout process. By +default, a Handel::Order object will be create unless you have set +C<order_class> to another class. C<order> can accept one of three possible parameter values: @@ -666,26 +782,25 @@ C<order> can accept one of three possible parameter values: =item order(\%filter) When you pass a HASH reference, C<order> will attempt to load all available -order using Handel::Order::load(\%filter). If multiple order are found, only -the first one will be used. +orders. If multiple order are found, only the first one will be used. $checkout->order({ shopper => '12345678-9098-7654-3212-345678909876', id => '11111111-2222-3333-4444-5555666677778888' }); -=item order(Handel::Order) +=item order($order) You can also pass in an already existing Handel::Order object or subclass. It will then be associated with the current checkout process. - my $order = Handel::Order->load({ + my $order = Handel::Order->search({ id => '12345678-9098-7654-3212-345678909876' - }); - + })->first; + $checkout->order($order); -=item order($orderid) +=item order('11111111-1111-1111-1111-111111111111') Finally, you can pass a valid order/uuid into C<order>. The matching order will be loaded and associated with the current checkout process. @@ -694,45 +809,60 @@ will be loaded and associated with the current checkout process. =back -=head2 phases(\@phases) +=head2 phases + +=over + +=item Arguments: \@phases -Get/Set the phases active for the current checkout process. This can be +=back + +Gets/sets the phases active for the current checkout process. This can be an array reference or a comma (or space) separated string: $checkout->phases([ CHECKOUT_PHASE_INITIALIZE, - CHECKOUT_PHASE_VALIDATION + CHECKOUT_PHASE_VALIDATE ]); + + $checkout->phases('CHECKOUT_PHASE_INITIALIZE, CHECKOUT_PHASE_VALIDATE']); - $checkout->phases('CHECKOUT_PHASE_INITIALIZE, CHECKOUT_PHASE_VALIDATION']); +No attempt is made to sanitize the array for duplicates or the order of the +phases. This means you can do evil things like run a phase twice, or run the +phases out of order. Returns a list in list context and an array reference in +scalar context. -No attempt is made to sanitize the array for duplicates or the order of the phases. -This means you can do evil things like run a phase twice, or run the phases -out of order. Returns a list in list context and an array reference in scalar context. +=head2 process -=head2 process([\@phases]) +=over + +=item Arguments: \@phases + +=back Executes the current checkout process pipeline and returns CHECKOUT_STATUS_*. -Any plugin handler that doesn't return CHECKOUT_HANDLER_OK or CHECKOUT_HANDLER_DECLINE -is considered to be an error that the checkout process is aborted. +Any plugin handler that doesn't return CHECKOUT_HANDLER_OK or +CHECKOUT_HANDLER_DECLINE is considered to be an error that the checkout process +is aborted. Just like C<phases>, you can pass an array reference or a comma (or space) separated string of phases into process. -The method $self->stash->clear is called before the call to -$plugin->setup so plugins can set stash data, and the stash remains until the -next call to process so $plugin->teardown can read any remaining stash data +The C<clear> method is called on the stash before the call to C<setup> on each +plugin so plugins can set stash data, and the stash remains until the next call +to process so $plugin->teardown can read any remaining stash data before C<process> ends. -The call to C<process> will return on of the following constants: +The call to C<process> will return one of the following constants: =over -=item CHECKOUT_STATUS_OK +=item C<CHECKOUT_STATUS_OK> -All plugin handlers were called and returned CHECKOUT_HANDLER_OK or CHECKOUT_HANDLER_DECLINE +All plugin handlers were called and returned CHECKOUT_HANDLER_OK or +CHECKOUT_HANDLER_DECLINE -=item CHECKOUT_STATUS_ERROR +=item C<CHECKOUT_STATUS_ERROR> At least one plugin failed to return or an error occurred while processing the registered plugin handlers. @@ -741,14 +871,46 @@ the registered plugin handlers. =head2 stash -Returns a Handel::Checkout::Stash object that can store information shared by -all plugins in the current context. +Returns a stash object that can store information shared by all plugins in the +current context. By default, a Handel::Checkout::Stash object will be create +unless you have set C<stash_class> to another class. # plugin handler my ($self, $ctx) = @_; $ctx->stash->{'template'} = 'template.tt'; +=head2 get_component_class + +=over + +=item Arguments: $name + +=back + +Gets the current class for the specified component name. + + my $class = $self->get_component_class('cart_class'); + +There is no good reason to use this. Use the specific class accessors instead. + +=head2 set_component_class + +=over + +=item Arguments: $name, $value + +=back + +Sets the current class for the specified component name. + + $self->set_component_class('cart_class', 'MyCartClass'); + +A L<Handel::Exception|Handel::Exception> exception will be thrown if the +specified class can not be loaded. + +There is no good reason to use this. Use the specific class accessors instead. + =head1 CONFIGURATION =head2 HandelPluginPaths @@ -766,8 +928,8 @@ You can also pass a comma or space separate list of namespaces. PerlSetVar HandelPluginPaths 'MyApp::Plugins, OtherApp::Plugins' -Any plugin found in the search path that isn't a subclass of Handel::Checkout::Plugin -will be ignored. +Any plugin found in the search path that isn't a subclass of +Handel::Checkout::Plugin will be ignored. =head2 HandelAddPluginPaths @@ -780,13 +942,14 @@ In the example above, when a checkout process is loaded, it will load all plugins in the Handel::Checkout::Plugin::*, MyApp::Plugins::*, and OtherApp::Plugins namespaces. -Any plugin found in the search path that isn't a subclass of Handel::Checkout::Plugin -will be ignored. +Any plugin found in the search path that isn't a subclass of +Handel::Checkout::Plugin will be ignored. =head2 HandelIgnorePlugins -This is a comma/space separated list [or an anonymous array, or a regex outside of httpd.conf] of plugins to ignore when loading -all available plugins in the given namespaces. +This is a comma/space separated list [or an anonymous array, or a regex outside +of httpd.conf] of plugins to ignore when loading all available plugins in the +given namespaces. PerlSetVar HandelIgnorePlugins 'Handel::Checkout::Plugin::Initialize' @@ -801,16 +964,18 @@ If the Handel::Checkout::Plugin namespace has the following modules: Handel::Checkout::Plugin::FaxDelivery Handel::Checkout::Plugin::EmailDelivery -all of the modules above will be loaded <b>except</b> Handel::Checkout::Plugin::Initialize. -All plugins in any other configured namespaces will be loaded. +all of the modules above will be loaded <b>except</b> +Handel::Checkout::Plugin::Initialize. All plugins in any other configured +namespaces will be loaded. -If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the plugins in -HandelLoadPlugins will be loaded, unless they are also in HandelIgnorePlugins in which case -they will be ignored. +If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the +plugins in HandelLoadPlugins will be loaded, unless they are also in +HandelIgnorePlugins in which case they will be ignored. =head2 HandelLoadPlugins -This is a comma or space separated list [or an anonymous array, or a regex outside of httpd.conf] of plugins to be loaded from the available namespaces. +This is a comma or space separated list [or an anonymous array, or a regex +outside of httpd.conf] of plugins to be loaded from the available namespaces. PerlSetVar HandelLoadPlugins 'Handel::Checkout::Plugin::ValidateAddress' @@ -827,20 +992,21 @@ If the following plugins are available in all configured namespaces: MyApp::Plugin::VerifiedByVisa MyApp::Plugin::WarehouseUpdate -only Handel::Checkout::Plugin::ValidateAddress will be loaded. All other plugins in all -configured namespaces will be ignored. +only Handel::Checkout::Plugin::ValidateAddress will be loaded. All other +plugins in all configured namespaces will be ignored. -If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the plugins in -HandelLoadPlugins will be loaded, unless they are also in HandelIgnorePlugins in which case -they will be ignored. +If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the +plugins in HandelLoadPlugins will be loaded, unless they are also in +HandelIgnorePlugins in which case they will be ignored. =head1 CAVEATS -[I think] Due to the localization of AutoCommit to coerce disabling of autoupdates during process, -Always access orders and order items from their checkout parent once they've been assigned to +[I think] Due to the localization of AutoCommit to coerce disabling of +autoupdates during process, Always access orders and order items from their +checkout parent once they've been assigned to the checkout process, and not any available reference: - my $order = Handel::Order->new({billtofirstname => 'Chris'}); + my $order = Handel::Order->create({billtofirstname => 'Chris'}); my $checkout = Handel::Checkout->new({order => $order}); # some plugin alters billtofirstname to 'Christopher' lib/Handel/Checkout.pm @@ -2,12 +2,11 @@ package Handel::Checkout::Message; use strict; use warnings; -use vars '$AUTOLOAD'; use overload '""' => \&stringify, fallback => 1; sub new { my ($class, %args) = @_; - my $self = bless \%args, ref $class || $class; + my $self = bless \%args, $class; return $self; }; @@ -15,13 +14,17 @@ sub new { sub stringify { my $self = shift; - return $self->text || $self; + if (my $text = $self->text) { + return $text; + } else { + return ref $self; + }; }; sub AUTOLOAD { my $self = shift; - my $name = $AUTOLOAD; + my $name = our $AUTOLOAD; $name =~ s/.*://; if (@_) { @@ -41,14 +44,14 @@ Handel::Checkout::Message - Checkout Pipeline Process Message =head1 SYNOPSIS use Handel::Checkout::Message; - + my $message = Handel::Checkout::Message->new( text => 'My Message', otherproperty => 'some data' ); - + $message->tempdata('stuff'); - + print $message->text; print $message->otherproperty; print $message->tempdata; @@ -59,17 +62,31 @@ Handel::Checkout::Message is just a simple blessed hash to hold any and every property you throw at it. It is autoloaded, so any instance method simple loads or sets the corresponding key value in the hash. -Handel::Checkout::Message stringifies to text() if available, otherwise it returns $self. +Handel::Checkout::Message stringifies to text() if available, otherwise it +returns $self. =head1 CONSTRUCTOR -=head2 new([%options]) +=head2 new + +=over + +=item Arguments: %options + +=back my $message = Handel::Checkout::Message->new( text => 'My Message', otherproperty => 'some data' ); +=head1 METHODS + +=head2 stringify + +Returns C<text> in scalar context. If no text is set, it returns the name of the +current message object. + =head1 SEE ALSO L<Handel::Constants>, L<Handel::Checkout::Plugin>, L<Handel::Order> lib/Handel/Checkout/Message.pm @@ -3,9 +3,14 @@ package Handel::Checkout::Plugin; use strict; use warnings; +BEGIN { + use Handel::L10N qw/translate/; + use Carp qw/cluck/; +}; + sub new { my ($class, $ctx) = @_; - my $self = bless {}, ref $class || $class; + my $self = bless {}, $class; $self->init($ctx); @@ -13,19 +18,21 @@ sub new { }; sub init { - + return; }; sub setup { - + return; }; sub teardown { - + return; }; sub register { - warn "Attempt to register plugin that hasn't defined 'register'!"; + cluck translate('PLUGIN_HAS_NO_REGISTER'); + + return; }; sub name { @@ -46,25 +53,25 @@ Handel::Checkout::Plugin - Base module for Handle::Checkout plugins package MyPackage::FaxOrder; use Handel::Constants qw(:checkout); use base 'Handel::Checkout::Plugin'; - + sub register { my ($self, $ctx) = @_; $ctx->add_handler(CHECKOUT_PHASE_DELIVER, \&deliver); }; - + sub deliver { my ($self, $ctx) = @_; - + ... - + return CHECKOUT_HANDLER_OK; }; =head1 DESCRIPTION -C<Handel::Checkout::Plugin> is the base module for all checkout pipeline -plugins used in C<Handel::Checkout>. +Handel::Checkout::Plugin is the base module for all checkout pipeline plugins +used in Handel::Checkout. =head1 CONSTRUCTOR lib/Handel/Checkout/Plugin.pm @@ -2,25 +2,30 @@ package Handel::Checkout::Plugin::AssignOrderNumber; use strict; use warnings; -use base 'Handel::Checkout::Plugin'; -use Handel::Constants qw(:checkout); + +BEGIN { + use base qw/Handel::Checkout::Plugin/; + use Handel::Constants qw/:checkout/; +}; sub register { my ($self, $ctx) = @_; $ctx->add_handler(CHECKOUT_PHASE_FINALIZE, \&handler); + + return; }; sub handler { my ($self, $ctx) = @_; $ctx->order->number(time); - $ctx->order->updated(scalar localtime); return CHECKOUT_HANDLER_OK; }; 1; +__END__ =head1 NAME @@ -29,13 +34,13 @@ Handel::Checkout::Plugin::AssignOrderNumber - Checkout plugin to assign order nu =head1 SYNOPSIS use Handel::Checkout; - + my $checkout = Handel::Checkout->new({ order => $order, phases => 'CHECKOUT_PHASE_FINALIZE', loadplugins => 'Handel::Checkout::Plugin::AssignOrderNumber' }); - + $checkout->process; =head1 DESCRIPTION @@ -43,6 +48,16 @@ Handel::Checkout::Plugin::AssignOrderNumber - Checkout plugin to assign order nu This checkout plugin simply assigns a number to $order->number during the CHECKOUT_PHASE_FINALIZE phase. +=head1 METHODS + +=head2 register + +Registers this plugin for the CHECKOUT_PHASE_FINALIZE phase. + +=head2 handler + +Assigns a number to the current order. + =head1 SEE ALSO L<Handel::Checkout::Plugin>, L<Handel::Checkout> lib/Handel/Checkout/Plugin/AssignOrderNumber.pm @@ -2,24 +2,30 @@ package Handel::Checkout::Plugin::MarkOrderSaved; use strict; use warnings; -use base 'Handel::Checkout::Plugin'; -use Handel::Constants qw(:checkout :order); + +BEGIN { + use base qw/Handel::Checkout::Plugin/; + use Handel::Constants qw/:checkout :order/; +}; sub register { my ($self, $ctx) = @_; $ctx->add_handler(CHECKOUT_PHASE_FINALIZE, \&handler); + + return; }; sub handler { my ($self, $ctx) = @_; - $ctx->order->type(ORDER_TYPE_SAVED); + $ctx->order->save; return CHECKOUT_HANDLER_OK; }; 1; +__END__ =head1 NAME @@ -28,13 +34,13 @@ Handel::Checkout::Plugin::MarkOrderSaved - Checkout plugin to mark the order ORD =head1 SYNOPSIS use Handel::Checkout; - + my $checkout = Handel::Checkout->new({ order => $order, phases => 'CHECKOUT_PHASE_FINALIZE', loadplugins => 'Handel::Checkout::Plugin::MarkOrderSaved' }); - + $checkout->process; =head1 DESCRIPTION @@ -42,6 +48,16 @@ Handel::Checkout::Plugin::MarkOrderSaved - Checkout plugin to mark the order ORD This checkout plugin simply changes $order->type to ORDER_TYPE_SAVED during the CHECKOUT_PHASE_FINALIZE phase. +=head1 METHODS + +=head2 register + +Registers this plugin for the CHECKOUT_PHASE_FINALIZE phase. + +=head2 handler + +Calls L<Handel::Order/save> to mark the current order as saved. + =head1 SEE ALSO L<Handel::Checkout::Plugin>, L<Handel::Checkout> lib/Handel/Checkout/Plugin/MarkOrderSaved.pm @@ -3,9 +3,18 @@ package Handel::Checkout::Stash; use strict; use warnings; +BEGIN { + use Handel::L10N qw/translate/; +}; + sub new { - my $class = shift; - my $self = bless {}, ref $class || $class; + my ($class, $data) = @_; + + throw Handel::Exception::Argument( + -details => translate('PARAM1_NOT_HASHREF') + ) if defined $data && ref($data) ne 'HASH'; ## no critic + + my $self = bless $data || {}, $class; return $self; }; @@ -14,6 +23,8 @@ sub clear { my $self = shift; %{$self} = (); + + return; }; 1; @@ -26,10 +37,10 @@ Handel::Checkout::Stash - Basic storage for checkout plugins during processing =head1 SYNOPSIS use Handel::Checkout; - + my $checkout = Handel::Checkout->new; $checkout->process; - + # later in some plugin sub myhandler { my ($self, $ctx) = @_; @@ -37,11 +48,11 @@ Handel::Checkout::Stash - Basic storage for checkout plugins during processing $ctx->stash->{'mystuff'}; ... }; - + # later in some other plugin sub myhandler { my ($self, $ctx) = @_; - + my $stuff = $ctx->stash->{'mystuff'}; ... }; @@ -59,13 +70,13 @@ tell Handel::Checkout to use the new stash instead: use strict; use warnings; use base 'Handel::Checkout::Stash'; - + sub clear {}; - + --- - + use Handel::Checkout; - + my $co = Handel::Checkout->new({ stash => MyApp::Stash->new }); @@ -74,7 +85,14 @@ tell Handel::Checkout to use the new stash instead: =head2 new -Creates a new instance of Handel::Checkout::Stash. +=over + +=item Arguments: \%data + +=back + +Creates a new instance of Handel::Checkout::Stash. You can optionally pass a hash +reference to new which will be blessed into the new stash instance. =head1 METHODS lib/Handel/Checkout/Stash.pm @@ -2,9 +2,11 @@ package Handel::ConfigReader; use strict; use warnings; -use vars qw(%Defaults $MOD_PERL); +use vars qw/%DEFAULTS $MOD_PERL/; -%Defaults = ( +my $instance; + +%DEFAULTS = ( HandelMaxQuantityAction => 'Adjust', HandelCurrencyCode => 'USD', HandelCurrencyFormat => 'FMT_STANDARD' @@ -12,16 +14,16 @@ use vars qw(%Defaults $MOD_PERL); BEGIN { use Tie::Hash; - use base 'Tie::StdHash'; + use base qw/Tie::StdHash/; - if (exists $ENV{MOD_PERL_API_VERSION} && $ENV{MOD_PERL_API_VERSION} == 2) { + if (exists $ENV{'MOD_PERL_API_VERSION'} && $ENV{'MOD_PERL_API_VERSION'} == 2) { require Apache2::RequestRec; require Apache2::RequestUtil; require Apache2::RequestIO; require Apache2::ServerUtil; $MOD_PERL = 2; - } elsif ($ENV{MOD_PERL}) { + } elsif ($ENV{'MOD_PERL'}) { require Apache; $MOD_PERL = 1; @@ -33,22 +35,31 @@ BEGIN { sub new { my $class = shift; my %config; - tie %config, __PACKAGE__; + tie %config, __PACKAGE__; ## no critic return bless \%config, $class; }; +sub instance { + if (!$instance) { + $instance = shift->new(@_); + }; + + return $instance; +}; + sub get { my ($self, $key) = (shift, shift); - my $default = shift || $Defaults{$key} || ''; + my $default = defined $_[0] ? shift : $DEFAULTS{$key}; + my $value = $self->{$key} || undef; - return $self->{$key} || $default; + return defined $value ? $value : $default; }; sub FETCH { my ($self, $key) = @_; - my $default = $Defaults{$key} || ''; - my $value = ''; + my $default = $DEFAULTS{$key}; + my $value; if ($MOD_PERL == 2) { my $c = eval { @@ -73,7 +84,9 @@ sub FETCH { }; # quick untaint for now. Assuming we'll mever get a ref from system os ENV - if (! ref $value && $value =~ /^(.*)$/g) { + if ($value && !ref $value) { + ## no critic + $value =~ /^(.*)$/g; $value = $1; }; @@ -83,7 +96,11 @@ sub FETCH { sub EXISTS { my ($self, $key) = @_; - return 1 if ($self->FETCH($key)); + if (defined $self->FETCH($key)) { + return 1; + }; + + return; }; sub STORE {}; @@ -95,14 +112,15 @@ __END__ =head1 NAME -Handel::ConfigReader - Read in Handel configuration settings +Handel::ConfigReader - Read in Handel configuration settings from ENV/ModPerl =head1 SYNOPSIS use Handel::ConfigReader; - - my $cfg = Handel::ConfigReader-new(); + + my $cfg = Handel::ConfigReader->instance(); my $setting = $cfg->get('HandelMaxQuantity'); + my $other = $cfg->{'OtherSetting'}; =head1 DESCRIPTION @@ -110,11 +128,10 @@ Handel::ConfigReader is a generic wrapper to get various configuration values. As some point this will probably get worked into XS/custom httpd.conf directives. -Starting in version 0.11, each instance is also a tied hash. The two usages are -the same: - - my $cfg = Handel::ConfigReader->new(); +Each configuration object is also a tied hash. The two usages are the same: + my $cfg = Handel::ConfigReader->instance(); + my $setting = $cfg->get('Setting'); my $setting = $cfg->{'Setting'}; @@ -125,25 +142,82 @@ Apache::ModuleConfig and custom directives which use the same hash syntax. =head2 new -Returns a new Handel::ConfigReader object. +Returns a new Handel::ConfigReader instance. my $cfg = Handel::ConfigReader->new(); +=head2 instance + +Returns the same Handel::ConfigReader instance for each call. + + my $cfg = Handel::ConfigReader->instance(); + =head1 METHODS -=head2 get($key [, $default]) +=head2 get + +=over + +=item Arguments: $key [, $default] + +=back Returns the configured value for the key specified. You can use this as an instance method or as a simpleton: - my $setting = Handel::ConfigReader->get('HandelMaxQuantity'); - - my $cfg = Handel::ConfigReader->new(); + my $cfg = Handel::ConfigReader->instance(); + my $setting = $cfg->get('HandelMaxQuantity'); + + my $cfg = Handel::ConfigReader->instance(); my $setting = $cfg->get('HandelMaxQuantity'); You can also pass a default value as the second parameter. If no value is loaded for the key specified, the default value will be returned instead. + my $cfg = Handel::ConfigReader->instance(); + my $setting = $cfg->get('DoesNotExist', 'foo'); + print $setting; # foo + +=head2 FETCH + +=over + +=item Arguments: $key + +=back + +Returns an item form the configuration via tied hash. + + my $cfg = Handel::ConfigReader->new; + my $setting = $cfg->{'MySetting'}; + +=head2 EXISTS + +=over + +=item Arguments: $key + +=back + +Returns true if the specified setting returns a defined value. + + my $cfg = Handel::ConfigReader->new; + if (exists $cfg->{'MySetting'}) { + ... + }; + +=head2 CLEAR + +Does nothing. + +=head2 DELETE + +Does nothing. + +=head2 STORE + +Does nothing. + =head1 CONFIGURATION Various Handel runtime options can be set via C<%ENV> variables, or using @@ -155,34 +229,34 @@ C<PerlSetVar> when running under C<mod_perl>. ... $ENV{HandelMaxQuantity} = 32; -If defined, this sets the maximum quantity allowed for each C<Handel::Cart::Item> -in the shopping cart. By default, when the user request more than -C<HandelMaxQuantity>, C<quantity> is reset to C<HandelMaxQuantity>. If you -would rather raise an C<Handel::Exception::Constraint> instead, see +If defined, this sets the maximum quantity allowed for each +C<Handel::Cart::Item> in the shopping cart. By default, when the user request +more than C<HandelMaxQuantity>, C<quantity> is reset to C<HandelMaxQuantity>. +If you would rather raise an C<Handel::Exception::Constraint> instead, see C<HandelMaxQuantityAction> below. =head2 HandelMaxQuantityAction (Adjust|Exception) -This option defines what action should be taken when a cart items quantity is being set -to something above C<HandelMaxQuantity>. When set to C<Adjust> the quantity will simply -be reset to C<HandelMaxQuantity> and no exception will be raised. This is the default -action. +This option defines what action should be taken when a cart items quantity is +being set to something above C<HandelMaxQuantity>. When set to C<Adjust> the +quantity will simply be reset to C<HandelMaxQuantity> and no exception will be +raised. This is the default action. -When set to <Exception> and the quantity requested is greater than C<HandelMaxQuantity>, -a C<Handel::Exception::Constraint> exception is thrown. +When set to <Exception> and the quantity requested is greater than +C<HandelMaxQuantity>, a C<Handel::Exception::Constraint> exception is thrown. =head2 HandelCurrencyCode This sets the default currency code used when no code is passed into C<format>. -See L<Locale::Currency::Format> for all available currency codes. The default code -is USD. +See L<Locale::Currency::Format> for all available currency codes. The default +code is USD. =head2 HandelCurrencyFormat This sets the default options used to format the price. See L<Locale::Currency::Format> for all available currency codes. The default format -used is C<FMT_STANDARD>. Just like in C<Locale::Currency::Format>, you can combine -options using C<|>. +used is C<FMT_STANDARD>. Just like in C<Locale::Currency::Format>, you can +combine options using C<|>. =head2 HandelDBIDriver @@ -229,8 +303,8 @@ You can also pass a comma or space separate list of namespaces. PerlSetVar HandelPluginPaths 'MyApp::Plugins, OtherApp::Plugins' -Any plugin found in the search path that isn't a subclass of Handel::Checkout::Plugin -will be ignored. +Any plugin found in the search path that isn't a subclass of +Handel::Checkout::Plugin will be ignored. =head2 HandelAddPluginPaths @@ -243,13 +317,14 @@ In the example above, when a checkout process is loaded, it will load all plugins in the Handel::Checkout::Plugin::*, MyApp::Plugins::*, and OtherApp::Plugins namespaces. -Any plugin found in the search path that isn't a subclass of Handel::Checkout::Plugin -will be ignored. +Any plugin found in the search path that isn't a subclass of +Handel::Checkout::Plugin will be ignored. =head2 HandelIgnorePlugins -This is a comma/space separated list [or an anonymous array, or a regex outside of httpd.conf] of plugins to ignore when loading -all available plugins in the given namespaces. +This is a comma/space separated list [or an anonymous array, or a regex outside +of httpd.conf] of plugins to ignore when loading all available plugins in the +given namespaces. PerlSetVar HandelIgnorePlugins 'Handel::Checkout::Plugin::Initialize' @@ -264,16 +339,18 @@ If the Handel::Checkout::Plugin namespace has the following modules: Handel::Checkout::Plugin::FaxDelivery Handel::Checkout::Plugin::EmailDelivery -all of the modules above will be loaded <b>except</b> Handel::Checkout::Plugin::Initialize. -All plugins in any other configured namespaces will be loaded. +all of the modules above will be loaded <b>except</b> +Handel::Checkout::Plugin::Initialize. All plugins in any other configured +namespaces will be loaded. -If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the plugins in -HandelLoadPlugins will be loaded, unless they are also in HandelIgnorePlugins in which case -they will be ignored. +If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the +plugins in HandelLoadPlugins will be loaded, unless they are also in +HandelIgnorePlugins in which case they will be ignored. =head2 HandelLoadPlugins -This is a comma or space separated list [or an anonymous array, or a regex outside of httpd.conf] of plugins to be loaded from the available namespaces. +This is a comma or space separated list [or an anonymous array, or a regex +outside of httpd.conf] of plugins to be loaded from the available namespaces. PerlSetVar HandelLoadPlugins 'Handel::Checkout::Plugin::ValidateAddress' @@ -290,12 +367,12 @@ If the following plugins are available in all configured namespaces: MyApp::Plugin::VerifiedByVisa MyApp::Plugin::WarehouseUpdate -only Handel::Checkout::Plugin::ValidateAddress will be loaded. All other plugins in all -configured namespaces will be ignored. +only Handel::Checkout::Plugin::ValidateAddress will be loaded. All other +plugins in all configured namespaces will be ignored. -If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the plugins in -HandelLoadPlugins will be loaded, unless they are also in HandelIgnorePlugins in which case -they will be ignored. +If both HandelLoadPlugins and HandelIgnorePlugins are specified, only the +plugins in HandelLoadPlugins will be loaded, unless they are also in +HandelIgnorePlugins in which case they will be ignored. =head1 AUTHOR lib/Handel/ConfigReader.pm @@ -2,12 +2,12 @@ package Handel::Constants; use strict; use warnings; -use vars qw(@EXPORT_OK %EXPORT_TAGS @CHECKOUT_ALL_PHASES); +use vars qw/@EXPORT_OK %EXPORT_TAGS @CHECKOUT_ALL_PHASES/; BEGIN { - use base 'Exporter'; - use Handel::L10N qw(translate); + use base qw/Exporter/; + use Handel::L10N qw/translate/; }; use constant CART_MODE_APPEND => 3; @@ -126,7 +126,7 @@ Handel::Constants - Common constants used in Handel use Handel::Constants qw(:cart); - my $cart = Handel::Cart->new({ + my $cart = Handel::Cart->create({ shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' }); @@ -136,15 +136,21 @@ Handel::Constants - Common constants used in Handel =head1 DESCRIPTION -C<Handel::Constants> contains a set of constants used throughout C<Handel>. It -may be useful (or even a good idea) to use these in your code. :-) +Handel::Constants contains a set of constants used throughout Handel. It may be +useful (or even a good idea) to use these in your code. :-) -By default, C<Handel::Constants> export C<nothing>. Use can use the export tags +By default, Handel::Constants export I<nothing>. You can use the export tags below to export all or only certain groups of constants. -=head1 METHODS +=head1 FUNCTIONS -=head2 str_to_const($) +=head2 str_to_const + +=over + +=item Arguments: $constant_name + +=back Converts a string version of a constant into that constants value. @@ -177,7 +183,7 @@ automatically reaped from the database during cleanup. =head2 CART_TYPE_TEMP -Any cart with this type could be purged form the database during cleanup at any +Any cart with this type could be purged from the database during cleanup at any time. =head2 CHECKOUT_PHASE_INITIALIZE @@ -186,16 +192,18 @@ The phase run when first creating a new order. =head2 CHECKOUT_PHASE_VALIDATE -The phase run to validate address, shipping, and other information about an order. +The phase run to validate address, shipping, and other information about an +order. =head2 CHECKOUT_PHASE_AUTHORIZE -The phase run when authorizing or validating credit card or other payment information. +The phase run when authorizing or validating credit card or other payment +information. =head2 CHECKOUT_PHASE_FINALIZE -The phase to run and post authorization order cleanup, like setting order number, before -order delivery/confirmation. +The phase to run and post authorization order cleanup, like setting order +number, before order delivery/confirmation. =head2 CHECKOUT_PHASE_DELIVER @@ -212,7 +220,8 @@ Contains all available phases. =head2 CHECKOUT_STATUS_OK -All plugin handlers returned successfully and the checkout process has completed. +All plugin handlers returned successfully and the checkout process has +completed. =head2 CHECKOUT_STATUS_ERROR @@ -234,30 +243,20 @@ using L<Handel::Checkout/add_handler> Specifies that the plugin handler encountered errors and would like to abort the checkout process. -=head2 RETURNAS_AUTO - -When calling C<load> or C<items> on C<Handel::Cart>, it will attempt to return -the most appropriate object. In list context, it will return a list. In -scalar context, it will return a C<Handel::Iterator> object. If the iterator -only contains one item, that item will be returns instead. - -=head2 RETURNAS_ITERATOR - -Always return a C<Handel::Iterator> object regardless of context or the amount -of results. +=head2 ORDER_TYPE_SAVED -=head2 RETURNAS_LIST - -Always return a list regardless of context or the amount of results. +Marks the order as permanent. Order with this value set should never be +automatically reaped from the database during cleanup. -=head2 RETURNAS_ARRAY +=head2 ORDER_TYPE_TEMP -Same as C<RETURNAS_LIST> +Any order with this type could be purged from the database during cleanup at any +time. =head1 EXPORT_TAGS -The following C<%EXPORT_TAGS> are defined for C<Handel::Constants>. See -L<Exporter> for further details on using export tags. +The following C<%EXPORT_TAGS> are defined for Handel::Constants. See +L<Exporter|Exporter> for further details on using export tags. =head2 :all @@ -267,9 +266,14 @@ This exports all constants found in this module. This exports all C<CART_*> constants in this module. -=head2 :returnas +=head2 :checkout + +This exports all C<CHECKOUT_*> constants in this module. + + +=head2 :order -This exports all C<RETURNAS_*> constants in this module. +This exports all C<ORDER_*> constants in this module. =head1 AUTHOR lib/Handel/Constants.pm @@ -2,24 +2,27 @@ package Handel::Constraints; use strict; use warnings; -use vars qw(@EXPORT_OK %EXPORT_TAGS); +use vars qw/@EXPORT_OK %EXPORT_TAGS/; BEGIN { use base 'Exporter'; use Handel; - use Handel::Constants qw(:cart :checkout :order); + use Handel::Constants qw/:cart :checkout :order/; use Handel::Exception; - use Handel::L10N qw(translate); + use Handel::L10N qw/translate/; + use Locale::Currency; + use Scalar::Util qw/blessed/; }; -@EXPORT_OK = qw(&constraint_quantity +@EXPORT_OK = qw/&constraint_quantity &constraint_price &constraint_uuid &constraint_cart_type + &constraint_cart_name &constraint_currency_code &constraint_checkout_phase &constraint_order_type -); +/; %EXPORT_TAGS = (all => \@EXPORT_OK); @@ -29,17 +32,17 @@ sub constraint_quantity { my $value = defined $_[0] ? shift : ''; my ($object, $column, $changing) = @_; - my $cfg = $Handel::Cfg; + my $cfg = Handel->config; my $max = $cfg->{'HandelMaxQuantity'}; my $action = $cfg->{'HandelMaxQuantityAction'}; if ($action =~ /^exception$/i && $max) { throw Handel::Exception::Constraint( -details => - translate('The quantity requested ([_1]) is greater than the maximum quantity allowed ([_2])', $value, $max) - ) if $value > $max; + translate('QUANTITY_GT_MAX', $value, $max) + ) if $value > $max; ## no critic } elsif ($action =~ /^adjust$/i && $max) { - if (ref($object) && $value) { - $changing->{'quantity'} = $max if $value > $max; + if (ref($object) && $value && $value > $max) { + $changing->{'quantity'} = $max; }; }; @@ -49,6 +52,10 @@ sub constraint_quantity { sub constraint_price { my $value = defined $_[0] ? shift : ''; + if (blessed $value && $value->isa('Data::Currency')) { + $value = $value->value; + }; + return ($value =~ /^\d{1,5}(\.\d{1,2})?$/); }; @@ -74,20 +81,26 @@ sub constraint_cart_type { return 1; }; +sub constraint_cart_name { + my ($value, $object, $column, $changing) = @_; + my $type = ref $changing ? $changing->{'type'} : ''; + + if (constraint_cart_type($type) && $type == CART_TYPE_SAVED && !length($value || '')) { + return 0; + }; + return 1; +}; + + sub constraint_currency_code { my $value = defined $_[0] ? uc(shift) : ''; - return unless ($value =~ /^[A-Z]{3}$/); + return unless ($value =~ /^[A-Z]{3}$/); ## no critic - eval 'use Locale::Currency'; - if (!$@) { - if (! keys %codes) { - %codes = map {uc($_) => uc($_)} all_currency_codes(); - }; - return exists $codes{$value}; + if (! keys %codes) { + %codes = map {uc($_) => uc($_)} all_currency_codes(); }; - - return 1; + return exists $codes{$value}; }; sub constraint_checkout_phase { @@ -124,42 +137,63 @@ Handel::Constraints - Common database constraints used to validate input data =head1 SYNOPSIS - use Handel::Constraints qw(constraint_quantity); - + use Handel::Constraints qw/constraint_quantity/; + my $qty = 'bogus-1'; - - if (constraint_quantity($qty) { + + if (constraint_quantity($qty)) { print 'invalid quantity'; }; =head1 DESCRIPTION -C<Handel::Constraints> contains a set of functions used to validate data -submitted by users into Handel objects. By default, C<Handel::Constraints> -doesn't export anything. Use the export tags to export groups of functions, or -specify the exact methods you are interested in using. See L<Exporter> for more +Handel::Constraints contains a set of functions used to validate data submitted +by users into Handel objects. By default, Handel::Constraints doesn't export +anything. Use the export tags to export groups of functions, or specify the +exact methods you are interested in using. See L<Exporter|Exporter> for more information on using export tags. =head1 FUNCTIONS =head2 constraint_quantity -Returns 1 if the value passed is a numeric, non-negative value, otherwise - it returns C<undef>. +=over + +=item Arguments: $quantity + +=back + +Returns 1 if the value passed is a numeric, non-negative value that is less +than or equal HandelMaxQuantity. Otherwise it returns C<undef>. + +See L<Handel::ConfigReader|Handel::ConfigReader> for more information on +HandelMaxQuantity and HandelMaxQuantityAction. =head2 constraint_price +=over + +=item Arguments: $price + +=back + Returns 1 if the value passed is a numeric, non-negative value between 0 and 99999.99, otherwise it returns C<undef>. =head2 constraint_uuid +=over + +=item Arguments: $string + +=back + Returns 1 if the value passed is conforms to the GUID/UUID format, otherwise it returns C<undef>. Currently, this does B<not> expect the brackets around the value. constraint_uuid( '11111111-1111-1111-1111-111111111111' ); # 1 - + constraint_uuid('{11111111-1111-1111-1111-111111111111}'); # undef This will probably change in the future, or some sort of stripping of the @@ -167,37 +201,72 @@ brackets may occur. =head2 constraint_cart_type +=over + +=item Arguments: $type + +=back + Returns 1 if the value passed is C<CART_TYPE_SAVED> or C<CART_TYPE_TEMP>, otherwise it returns C<undef>. =head2 constraint_currency_code +=over + +=item Arguments: $code + +=back + Returns 1 if the value passed is considered a 3 letter currency code. -If L<Locale::Currency> is installed, it will verify the 3 letter code is -actually a valid currency code. +If L<Locale::Currency|Locale::Currency> is installed, it will verify the 3 +letter code is actually a valid currency code. -If C<Locale::Currency> is not installed, it simply checks that the code -conforms to: +If Locale::Currency is not installed, it simply checks that the code conforms +to: /^[A-Z]{3}$/ =head2 constraint_checkout_phase +=over + +=item Arguments: $phase + +=back + Returns 1 if the value passed is one of the C<CHECKOUT_PHASE_*> constants, otherwise it returns C<undef>. =head2 constraint_order_type +=over + +=item Arguments: $type + +=back + Returns 1 if the value passed is C<ORDER_TYPE_SAVED> or C<ORDER_TYPE_TEMP>, otherwise it returns C<undef>. +=head2 constraint_cart_name + +=over + +=item Arguments: $name + +=back + +Returns 0 if the cart type is C<CART_TYPE_SAVED> and the name is undefined, +otherwise it returns 1. + =head1 EXPORT_TAGS =head2 :all -Exports all functions into the classes namespace. +Exports all functions into the callers namespace. - use Handel::Constraints qw(:all); + use Handel::Constraints qw/:all/; =head1 AUTHOR lib/Handel/Constraints.pm @@ -2,90 +2,83 @@ package Handel::Currency; use strict; use warnings; -use overload '""' => \&stringify, fallback => 1; BEGIN { - use Handel; - use Handel::Constraints qw(:all); - use Handel::Exception; - use Handel::L10N qw(translate); + use base qw/Data::Currency/; + use Handel (); + use Handel::Exception (); + use Handel::L10N qw/translate/; + use Handel::Constraints qw/constraint_currency_code/; + use Class::Inspector (); }; -sub new { - my ($class, $value) = @_; - my $self = bless {price => $value}, ref($class) || $class; +sub code { + my ($self, $code) = @_; + my $cfg = Handel->config; - eval 'use Finance::Currency::Convert::WebserviceX'; - if (!$@) { - $self->{'converter'} = Finance::Currency::Convert::WebserviceX->new; - }; - - return $self; -}; - -sub format { - my ($self, $code, $format) = @_; + if ($code) { + throw Handel::Exception::Argument( + -details => translate('CURRENCY_CODE_INVALID', $code) + ) unless constraint_currency_code($code); ## no critic - eval 'use Locale::Currency::Format'; - return $self->{'price'} if $@; - - my $cfg = $Handel::Cfg; + $self->SUPER::code($code); + }; - eval '$format = ' . ($format || $cfg->{'HandelCurrencyFormat'}); - $code ||= $cfg->{'HandelCurrencyCode'}; + $code = $self->get_simple('code') || $cfg->{'HandelCurrencyCode'}; throw Handel::Exception::Argument( - -details => translate("Currency code '[_1]' is invalid or malformed", $code) . '.') unless - constraint_currency_code($code); + -details => translate('CURRENCY_CODE_INVALID', $code) + ) unless constraint_currency_code($code); ## no critic - return _to_utf8(currency_format($code, $self->{'price'}, $format)); + return $code; }; sub convert { - my ($self, $from, $to, $format, $options) = @_; - my $cfg = $Handel::Cfg; - - $from ||= $cfg->{'HandelCurrencyCode'}; - $to ||= $cfg->{'HandelCurrencyCode'}; - eval '$options = ' . ($options || $cfg->{'HandelCurrencyFormat'}); + my ($self, $to) = @_; + my $from = $self->code; - return if uc($from) eq uc($to); + $to ||= ''; throw Handel::Exception::Argument( - -details => translate("Currency code '[_1]' is invalid or malformed", $from) . '.') unless - constraint_currency_code($from); + -details => translate('CURRENCY_CODE_INVALID', $from) + ) unless constraint_currency_code($from); ## no critic throw Handel::Exception::Argument( - -details => translate("Currency code '[_1]' is invalid or malformed", $to) . '.') unless - constraint_currency_code($to); + -details => translate('CURRENCY_CODE_INVALID', $to) + ) unless constraint_currency_code($to); ## no critic - my $result = defined $self->{'converter'} ? - $self->{'converter'}->convert($self->{'price'}, $from, $to) : - undef; + return $self->SUPER::convert($to); +}; - eval 'use Locale::Currency::Format'; - if (!$@ && defined $result && $format) { - return _to_utf8(currency_format($to, $result, $options)); - }; +sub format { + my ($self, $format) = @_; + my $cfg = Handel->config; - return $result; -}; + if ($format) { + $self->SUPER::format($format); + }; -sub stringify { - my $self = shift; + $format = $self->get_simple('format') || $cfg->{'HandelCurrencyFormat'}; - return $self->{'price'}; + return $format ? $format : undef; }; -sub _to_utf8 { - my $value = shift; +sub set_component_class { + my ($self, $field, $value) = @_; - if ($] >= 5.008) { - require utf8; - utf8::upgrade($value); + if ($value) { + if (!Class::Inspector->loaded($value)) { + eval "use $value"; ## no critic + + throw Handel::Exception( + -details => translate('COMPCLASS_NOT_LOADED', $field, $value) + ) if $@; ## no critic + }; }; - return $value; + $self->set_inherited($field, $value); + + return; }; 1; @@ -98,99 +91,229 @@ Handel::Currency - Price container to do currency conversion/formatting =head1 SYNOPSIS use Handel::Currency; - - my $curr = Handel::Currenct-new(1.2); - print $curr->format(); # 1.20 USD - print $curr->format('CAD'); # 1.20 CAD - print $curr->format(undef, 'FMT_SYMBOL'); # $1.20 - + + my $price = Handel::Currency->new(1.2. 'USD'); + print $price; # 1.20 USD + print $price+1 # 2.2 + print $price->code; # USD + print $price->format; # FMT_SYMBOL + print $price->as_string; # 1.20 USD + print $price->as_string('FMT_SYMBOL'); # $1.20 + print 'Your price in Canadian Dollars is: '; - print $curr->convert('USD', 'CAD'); + print $price->convert('CAD')->value; =head1 DESCRIPTION -The C<Handel::Currency> module provides basic currency formatting within -Handel. It can be used separately to format any number into a more friendly -format: +The Handel::Currency module provides basic currency formatting within Handel +using L<Data::Currency|Data::Currency>. It can be used separately to format any +number into a more friendly formatted currency string. my $price = 1.23; my $currency = Handel::Currency->new($price); - print $currency->format; + print $currency->as_string; A new Handel::Currency object is automatically returned within the shopping cart when calling C<subtotal>, C<total>, and C<price> as an lvalue: - my $cart = Handel::Cart->load({id => '11111111-1111-1111-1111-111111111111'}); + my $cart = Handel::Cart->search({id => '11111111-1111-1111-1111-111111111111'}); print $cart->subtotal; # 12.9 - print $cart->subtotal->format(); # 12.90 USD + print $cart->subtotal->as_string; # 12.90 USD -By default, a Handel::Currency object will stringify to the original decimal -based price. +Each Handel::Currency object will stringify to the original value except in +string context, where it stringifies to the format specified in C<format>. =head1 CONSTRUCTOR =head2 new -The create a new Handel::Currency instance, simply call C<new> and pass in the +=over + +=item Arguments: $price [, $code, $format] + +=back + +To creates a new Handel::Currency object, simply call C<new> and pass in the price to be formatted: my $currency = Handel::Currency->new(10.23); +You can also pass in the default currency code and/or currency format to be +used. If no code or format are supplied, future calls to C<format>, C<code> and +C<convert> will use the C<HandelCurrencyCode> and C<HandelCurrencyFormat> +environment variables. + =head1 METHODS -=head2 format([$code, $options]) +=head2 as_string + +=over + +=item Arguments: $format + +=back + +Returns the freshly formatted price in a format declared in +L<Locale::Currency::Format|Locale::Currency::Format>. If no format options are +specified, the defaults values from C<new> and then +C<HandelCurrencyFormat> are used. Currently the default format is +C<FMT_STANDARD>. + +It is also acceptable to specify different default values. +See L</"CONFIGURATION"> and C<Handel::ConfigReader> for further details. + +=head2 code + +=over + +=item Arguments: $code + +=back + +Gets/sets the three letter currency code for the current currency object. + +C<code> throws a L<Handel::Exception::Argument|Handel::Exception::Argument> +if C<code> isn't a valid currency code. If no code was passed during object +creation, I<no code will be return by this method> unless C<HandelCurrencyCode> +is set. + +=head2 convert + +=over + +=item Arguments: $code + +=back -The C<format> method returns the freshly formatted price in a currency and -format declared in C<Locale::Currency::Format>. If no currency code or -format are specified, the defaults values from C<Handel::ConfigReader> are -used. Currently those defaults are C<USD> and C<FMT_STANDARD>. +Returns a new Handel::Currency object containing the converted price value. + +If no C<code> is specified for the current currency object, the +C<HandelCurrencyCode> will be used as the currency code to convert from. If the +currency you are converting to is the same as the currency objects current +currency code, convert will just return itself. + +You can also chain the C<convert> call into other method calls: + + my $price = Handel::Currency->new(1.25, 'USA'); + print $price->convert('CAD')->format('FMT_STANDARD')->as_string; + +C<convert> throws a L<Handel::Exception::Argument|Handel::Exception::Argument> +if C<code> isn't valid currency code or isn't defined. + +It is also acceptable to specify different default values. +See L</"CONFIGURATION"> and C<Handel::ConfigReader> for further details. + +=head2 converter_class + +=over + +=item Arguments: $converter_class + +=back + +Gets/sets the converter class to be used when converting currency numbers. + + __PACKAGE__->currency_class('MyCurrencyConverter'); + +The converter class can be any class that supports the following method +signature: + + sub convert { + my ($self, $price, $from, $to) = @_; + + return $converted_price; + }; + +A L<Handel::Exception|Handel::Exception> exception will be thrown if the +specified class can not be loaded. + +=head2 format + +=over + +=item Arguments: $format + +=back + +Gets/sets the format to be used when displaying this object as a formatted +currency string. + +If no format is defined, the defaults value C<HandelCurrencyFormat> is used. +Currently the default format is C<FMT_STANDARD>. It is also acceptable to specify different default values. See L</"CONFIGURATION"> and C<Handel::ConfigReader> for further details. -In situations where C<Locale::Currency::Format> isn't installed, C<format> -simply returns the price in it's original format no harm no foul. +=head2 name + +Returns the currency name for the current objects currency code. If no +currency code is set, the code set in C<HandelCurrencyCode> will be used. + +C<name> throws a L<Handel::Exception::Argument|Handel::Exception::Argument> +if code used isn't a valid currency code. + +=head2 stringify + +Sames as C<as_string>. + +=head2 value + +Returns the original price value given to C<new>. Always use this instead of +relying on stringification when deflating currency objects in DBIx::Class +schemas. + +=head2 get_component_class + +=over + +=item Arguments: $name + +=back + +Gets the current class for the specified component name. + + my $class = $self->get_component_class('item_class'); + +There is no good reason to use this. Use the specific class accessors instead. + +=head2 set_component_class -C<format> throws a C<Handel::Exception::Argument> if C<code> isn't a valid -currency code. +=over -=head2 convert($from, $to [, $format, $options]) +=item Arguments: $name, $value -The C<convert> method converts the given price from one currency to another -using C<Finance::Currency::Convert::WebserviceX>. +=back -In situations where C<Finance::Currency::Convert::WebserviceX> isn't installed, -C<convert> simply returns undef. +Sets the current class for the specified component name. -If no C<from> is specified, C<HandelCurrencyCode> below will be used instead. + $self->set_component_class('item_class', 'MyItemClass'); -C<convert> throws a C<Handel::Exception::Argument> if C<from> or C<to> aren't -valid currency codes. +A L<Handel::Exception|Handel::Exception> exception will be thrown if the +specified class can not be loaded. -If C<$format> is true, the result of the conversion will also be formatted -using the formatting C<options> given or the default in -C<HandelCurrencyFormat>. +There is no good reason to use this. Use the specific class accessors instead. =head1 CONFIGURATION =head2 HandelCurrencyCode -This sets the default currency code used when no code is passed into C<format>. -See C<Locale::Currency::Format> for all available currency codes. The default -code is USD. +This sets the default currency code used when no code is passed into C<new>. +See L<Locale::Currency::Format|Locale::Currency::Format> for all available +currency codes. The default code is USD. =head2 HandelCurrencyFormat This sets the default options used to format the price. See -C<Locale::Currency::Format> for all available currency codes. The default -format used is C<FMT_STANDARD>. Just like in C<Locale::Currency::Format>, -you can combine options using C<|>. +L<Locale::Currency::Format|Locale::Currency::Format> for all available currency +codes. The default format used is C<FMT_STANDARD>. Just like in +Locale::Currency::Format, you can combine options using C<|>. =head1 SEE ALSO -L<Locale::Currency::Format>, L<Finance::Currency::Convert::WebserviceX> +L<Data::Currency>, L<Locale::Currency>, L<Locale::Currency::Format>, +L<Finance::Currency::Convert::WebserviceX> =head1 AUTHOR lib/Handel/Currency.pm @@ -4,11 +4,13 @@ use strict; use warnings; BEGIN { - use base 'Error'; - use Handel::L10N qw(translate); - eval 'require Apache::AxKit::Exception'; - if (!$@) { - push @__PACKAGE__::ISA, 'Apache::AxKit::Exception'; + use base qw/Error/; + use Handel::L10N qw/translate/; + use Class::Inspector; + + if (Class::Inspector->loaded('Apache::AxKit::Exception')) { + no strict 'vars'; + push @ISA, 'Apache::AxKit::Exception'; ## no critic }; }; @@ -18,13 +20,11 @@ sub new { my $class = shift; my %args = @_; my $text = translate( - $args{-text} || 'An unspecified error has occurred' + $args{-text} || 'UNHANDLED_EXCEPTION' ); - if ( defined( $args{-details} ) ) { + if ( defined($args{'-details'}) && ! ref $args{'-details'}) { $text .= ': ' . $args{-details}; - } else { - # $text .= '.'; }; ## don't pass the original text @@ -33,34 +33,40 @@ sub new { return $class->SUPER::new( -text => $text, %args ); }; +sub details { + return shift->{'-details'}; +}; + +sub results { + return shift->{'-results'}; +}; package Handel::Exception::Constraint; use strict; use warnings; BEGIN { - use base 'Handel::Exception'; + use base qw/Handel::Exception/; }; sub new { my $class = shift; return $class->SUPER::new( - -text => 'The supplied field(s) failed database constraints', @_ ); + -text => 'CONSTRAINT_EXCEPTION', @_ ); }; - package Handel::Exception::Argument; use strict; use warnings; BEGIN { - use base 'Handel::Exception'; + use base qw/Handel::Exception/; }; sub new { my $class = shift; return $class->SUPER::new( - -text => 'The argument supplied is invalid or of the wrong type', @_ ); + -text => 'ARGUMENT_EXCEPTION', @_ ); }; package Handel::Exception::Taglib; @@ -68,13 +74,13 @@ use strict; use warnings; BEGIN { - use base 'Handel::Exception'; + use base qw/Handel::Exception/; }; sub new { my $class = shift; return $class->SUPER::new( - -text => 'The tag is out of scope or missing required child tags', @_ ); + -text => 'XSP_TAG_EXCEPTION', @_ ); }; package Handel::Exception::Order; @@ -82,13 +88,13 @@ use strict; use warnings; BEGIN { - use base 'Handel::Exception'; + use base qw/Handel::Exception/; }; sub new { my $class = shift; return $class->SUPER::new( - -text => 'An error occurred while while creating or validating the current order', @_ ); + -text => 'ORDER_EXCEPTION', @_ ); }; package Handel::Exception::Checkout; @@ -96,13 +102,55 @@ use strict; use warnings; BEGIN { - use base 'Handel::Exception'; + use base qw/Handel::Exception/; +}; + +sub new { + my $class = shift; + return $class->SUPER::new( + -text => 'CHECKOUT_EXCEPTION', @_ ); +}; + +package Handel::Exception::Storage; +use strict; +use warnings; + +BEGIN { + use base qw/Handel::Exception/; +}; + +sub new { + my $class = shift; + return $class->SUPER::new( + -text => 'STORAGE_EXCEPTION', @_ ); +}; + +package Handel::Exception::Validation; +use strict; +use warnings; + +BEGIN { + use base qw/Handel::Exception/; +}; + +sub new { + my $class = shift; + return $class->SUPER::new( + -text => 'VALIDATION_EXCEPTION', @_ ); +}; + +package Handel::Exception::Virtual; +use strict; +use warnings; + +BEGIN { + use base qw/Handel::Exception/; }; sub new { my $class = shift; return $class->SUPER::new( - -text => 'An error occurred during the checkout process', @_ ); + -text => 'VIRTUAL_METHOD', @_ ); }; 1; @@ -116,13 +164,11 @@ Handel::Exception - Exceptions used within Handel use Handel::Cart; use Handel::Exception' qw(:try); - + try { my $cart = Handel::Cart->new('junk crap'); - } catch Handel::Exception::Argument with { print 'Passed the wrong arguments to method'; - } catch Handel::Exception with { print 'Unknown issue with Handel'; } catch Error with { @@ -133,8 +179,8 @@ Handel::Exception - Exceptions used within Handel =head1 DESCRIPTION -C<Handel::Exception> subclasses L<Error> and attempts to throw exceptions when -unexpected things happen. +Handel::Exception subclasses L<Error|Error> and attempts to throw exceptions +when unexpected things happen. =head1 EXCEPTIONS @@ -161,8 +207,21 @@ exceptions. =head2 Handel::Exception::Constraint This exception is thrown if a database constraint is violated. This is true for -both raw DBI database constraint errors as well as field updates that don't -pass constraints in C<Handel::Constraints>. +both raw DBI database constraint errors as well as field updates that don't +pass constraints in +L<Handel::Components::Constraints|Handel::Components::Constraints>. + +=head2 Handel::Exception::Validation + +This exception is thrown if the validation performed by +L<Handel::Components::Validation|Handel::Components::Validation> has failed. +If the validation component returned a result object, that can be found in +$E-E<gt>results. + +=head2 Handel::Exception::Storage + +This exception is thrown if there are any configuration or setup errors in +Handel::Storage. =head2 Handel::Exception::Argument @@ -172,22 +231,31 @@ into methods. =head2 Handel::Exception::Taglib This exception is thrown when an unexpected error occurs within -C<AxKit::XSP::Handel::Cart> taglib. +the AxKit taglibs. =head1 METHODS =head2 new -This returns a new C<Handel::Exception> object. This is mostly used internally -by L<Error>. In most circumstance, you don't need to call C<new> at all. +This returns a new Handel::Exception object. This is mostly used internally +by L<Error|Error>. In most circumstances, you don't need to call C<new> at all. Instead, simply use the C<throw> syntax: use Handel::Exceptions; - + throw Handel::Exception::Taglib( -text => translate("Tag '[_1]' not valid inside of other Handel tags", $tag) ) if ($context[$#context] ne 'root'); +=head2 details + +Returns the details portion of the exception message if there are any. + +=head2 results + +Returns the data validation result errors from exceptions thrown by +L<Handel::Components::Validation|Handel::Components::Validation>. + =head1 SEE ALSO L<Error>, L<Handel::Constraints> lib/Handel/Exception.pm @@ -1,10 +1,85 @@ # $Id$ +## no critic (ProhibitAmbiguousNames, RequireFinalReturn) package Handel::Iterator; use strict; use warnings; +use overload + '0+' => \&count, + 'bool' => \&count, + '==' => \&count, + fallback => 1; BEGIN { - use base 'Class::DBI::Iterator'; + use base qw/Class::Accessor::Grouped/; + __PACKAGE__->mk_group_accessors('inherited', qw/data result_class storage/); + + use Handel::Exception qw/:try/; + use Handel::L10N qw/translate/; +}; + +sub new { + my ($class, $options) = @_; + + throw Handel::Exception::Argument( + -details => translate('PARAM1_NOT_HASHREF') + ) unless ref $options eq 'HASH'; ## no critic + + throw Handel::Exception::Argument( + -details => translate('NO_ITERATOR_DATA') + ) unless $options->{'data'}; ## no critic + + throw Handel::Exception::Argument( + -details => translate('NO_RESULT_CLASS') + ) unless $options->{'result_class'}; ## no critic + + throw Handel::Exception::Argument( + -details => translate('NO_STORAGE') + ) unless $options->{'storage'}; ## no critic + + return bless $options, $class; +}; + +sub all { + throw Handel::Exception::Virtual; +}; + +sub count { + throw Handel::Exception::Virtual; +}; + +sub first { + throw Handel::Exception::Virtual; +}; + +sub last { + throw Handel::Exception::Virtual; +}; + +sub next { + throw Handel::Exception::Virtual; +}; + +sub reset { + throw Handel::Exception::Virtual; +}; + +sub create_result { + my ($self, $result, $storage) = @_; + if (!$storage) { + $storage = $self->storage; + }; + + throw Handel::Exception::Argument( -text => + translate('NO_RESULT') + ) unless $result; ## no critic + + throw Handel::Exception::Argument( -text => + translate('NO_STORAGE') + ) unless $storage; ## no critic + + return $self->result_class->create_instance( + $result, $storage + ); }; 1; @@ -12,32 +87,131 @@ __END__ =head1 NAME -Handel::Iterator - Iterator class used for collection looping +Handel::Iterator - Iterator base class used for collection looping =head1 SYNOPSIS - use Handel::Cart; + my $iterator = Handel::Iterator::Custom->new({ + data => [$object1, $object2, ...], + result_class => 'MyResult', + storage => $storage + }); + + while (my $result = $iterator->next) { + print $result->method; + }; + +=head1 DESCRIPTION + +Handel::Iterator is a base class used to create custom iterators for +DBIx::Class resultsets and lists of results. + +=head1 CONSTRUCTOR + +=head2 new + +=over + +=item Arguments: \%options + +=back - my $cart = Handel::Cart->new({ - shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' +Creates a new iterator object. The following options are available: + + my $iterator = Handel::Iterator::Custom->new({ + data => [$object1, $object2, ...], + result_class => 'MyResult', + storage => $storage }); - my $iterator = $cart->items; - while (my $item = $iterator->next) { - print $item->sku; - print $item->price; - print $item->total; + my $result = $iterator->first; + print ref $result; # MyResult + +=over + +=item data + +The data to be iterated through. The type of this data depends on the +individual subclass. + +=item result_class + +The name of the class that each result should be inflated into. + +=item storage + +The storage object that was used to create the results. + +=back + +=head1 METHODS + +=head2 all + +Returns all results from current iterator. + + foreach my $result ($iterator->all) { + print $result->method; }; -=head1 DESCRIPTION +=head2 count + +Returns the number of results in the current iterator. + + my $count = $iterator->count; + +=head2 create_result + +=over -C<Handel::Iterator> is used internally by C<Handel::Cart> to iterate through -collections of carts and cart items. At this point, there should be no reason to -use it directly. +=item Arguments: $result [, $storage] + +=back + +Returns a new result class object based on the specified result and storage +objects. If no storage object is specified, the storage object passed to C<new> +will be used instead. + +This method is used by methods like C<first> and C<next> to to create storage +result objects. There is probably no good reason to use this method directly. + +=head2 first + +Returns the first result or undef if there are no results. + + my $first = $iterator->first; + +=head2 last + +Returns the last result or undef if there are no results. + + my $last = $iterator->last; + +=head2 next + +Returns the next result or undef if there are no results. + + while (my $result = $iterator->next) { + print $result->method; + }; + +=head2 reset + +Resets the current result position back to the first result. + + while (my $result = $iterator->next) { + print $result->method; + }; + + $iterator->reset; + + while (my $result = $iterator->next) { + print $result->method; + }; =head1 SEE ALSO -L<Handel::Cart> +L<Handel::Iterator::DBIC>, L<Handel::Iterator::List> =head1 AUTHOR lib/Handel/Iterator.pm @@ -1,13 +1,13 @@ # $Id$ +## no critic (ProhibitPackageVars) package Handel::L10N; use strict; use warnings; use utf8; -use vars qw(@EXPORT_OK %Lexicon $handle); +use vars qw/@EXPORT_OK %Lexicon $handle/; BEGIN { - use base 'Locale::Maketext'; - use base 'Exporter'; + use base qw/Locale::Maketext Exporter/; }; @EXPORT_OK = qw(translate); @@ -32,7 +32,7 @@ Handel::L10N - Localization module for Handel =head1 SYNOPSIS use Handel::L10N qw(translate); - + warn translate('This is my message'); =head1 DESCRIPTION @@ -44,25 +44,40 @@ export anything. You can either use it directly: warn Handel::L10N::translate('My message'); -You can also export C<translate> into the users namespace: +You can also export C<translate> into the callers namespace: - use Handel::L10N qw(translate); + use Handel::L10N qw/translate/; warn translate('My message'); -Thus far, the French translation comes from Googles translation tools. IF you -have the time and can do better, the help would be much appreciated. +If you have the time and can do a language, the help would be much appreciated. +If you're going to email a translation module, please Gzip it first. It's not +uncommon for an email server along the way to trash UTF-8 characters in the +.pm attachment text. -=head1 METHODS +There is also a t/l10n_lexicon_synced.t test that ensures that each lexicon +has the same number of keys as the English version. Please make sure to +run/update that test before submitting your lexicon. + +=head1 FUNCTIONS =head2 translate +=over + +=item Arguments: $message + +=back + Translates the supplied text into the appropriate language if available. If no match is available, the original text is returned. + print translate('foo was here'); + =head1 SEE ALSO -L<Locale::Maketext>, L<Handel::L10N::us_en>, L<Handel::L10N::fr> +L<Locale::Maketext>, L<Handel::L10N::us_en>, L<Handel::L10N::fr>, +L<Handel::L10N::zh_tw> =head1 AUTHOR lib/Handel/L10N.pm @@ -1,16 +1,209 @@ +## no critic # $Id$ package Handel::L10N::en_us; use strict; use warnings; use utf8; -use vars qw(%Lexicon); +use vars qw/%Lexicon/; BEGIN { - use base 'Handel::L10N'; + use base qw/Handel::L10N/; }; %Lexicon = ( Language => 'English', + + COMPAT_DEPRECATED => + 'Handel::Compat is deprecated and will go away in a future release.', + + COMPCLASS_NOT_LOADED => + 'The component class [_1] [_2] could not be loaded', + + PARAM1_NOT_HASHREF => + 'Param 1 is not a HASH reference', + + PARAM1_NOT_HASHREF_CARTITEM => + 'Param 1 is not a HASH reference or Handel::Cart::Item', + + PARAM1_NOT_HASHREF_CART => + 'Param 1 is not a HASH reference or Handel::Cart', + + PARAM1_NOT_HASHREF_ORDER => + 'Param 1 is not a HASH reference or Handel::Order', + + PARAM1_NOT_CHECKOUT_PHASE => + 'Param 1 is not a valid CHECKOUT_PHASE_* value', + + PARAM1_NOT_CODEREF => + 'Param 1 is not a CODE reference', + + PARAM1_NOT_CHECKOUT_MESSAGE => + 'Param 1 is not a Handel::Checkout::Message object or text message', + + PARAM1_NOT_HASH_CARTITEM_ORDERITEM => + 'Param 1 is not a HASH reference, Handel::Cart::Item or Handel::Order::Item', + + PARAM1_NOT_ARRAYREF_STRING => + 'Param 1 is not an ARRAY reference or string', + + PARAM2_NOT_HASHREF => + 'Param 2 is not a HASH reference', + + CARTPARAM_NOT_HASH_CART => + 'Cart reference is not a HASH reference or Handel::Cart', + + COLUMN_NOT_SPECIFIED => + 'No column was specified', + + COLUMN_NOT_FOUND => + 'Column [_1] does not exist', + + COLUMN_VALUE_EXISTS => + '[_1] value already exists', + + CONSTRAINT_NAME_NOT_SPECIFIED => + 'No constraint name was specified', + + CONSTRAINT_NOT_SPECIFIED => + 'No constraint was specified', + + UNKNOWN_RESTORE_MODE => + 'Unknown restore mode', + + HANDLER_EXISTS_IN_PHASE => + 'There is already a handler in phase ([_1]) for preference ([_2]) from the plugin ([_3])', + + CONSTANT_NAME_ALREADY_EXISTS => + 'A constant named [_1] already exists in Handel::Constants', + + CONSTANT_VALUE_ALREADY_EXISTS => + 'A phase constant value of [_1] already exists', + + CONSTANT_EXISTS_IN_CALLER => + 'A constant named [_1] already exists in caller [_2]', + + NO_ORDER_LOADED => + 'No order is assocated with this checkout process', + + CART_NOT_FOUND => + 'Could not find a cart matching the supplied search criteria', + + ORDER_NOT_FOUND => + 'Could not find an order matching the supplied search criteria', + + ORDER_CREATE_FAILED_CART_EMPTY => + 'Could not create a new order because the supplied cart is empty', + + ROLLBACK_FAILED => + 'Transaction aborted. Rollback failed: [_1]', + + QUANTITY_GT_MAX => + 'The quantity requested ([_1]) is greater than the maximum quantity allowed ([_2])', + + CURRENCY_CODE_INVALID => + 'Currency code [_1] is invalid or malformed', + + UNHANDLED_EXCEPTION => + 'An unspecified error has occurred', + + CONSTRAINT_EXCEPTION => + 'The supplied field(s) failed database constraints', + + ARGUMENT_EXCEPTION => + 'The argument supplied is invalid or of the wrong type', + + XSP_TAG_EXCEPTION => + 'The tag is out of scope or missing required child tags', + + ORDER_EXCEPTION => + 'An error occurred while while creating or validating the current order', + + CHECKOUT_EXCEPTION => + 'An error occurred during the checkout process', + + STORAGE_EXCEPTION => + 'An error occurred while loading storage', + + VALIDATION_EXCEPTION => + 'The data could not be written because it failed validation', + + VIRTUAL_METHOD => + 'Virtual method not implemented', + + NO_STORAGE => + 'Storage not supplied', + + NO_RESULT_CLASS => + 'Result class not supplied', + + NO_ITERATOR_DATA => + 'Iterator data not supplied', + + ITERATOR_DATA_NOT_ARRAYREF => + 'Iterator data is not an ARRAY reference', + + ITERATOR_DATA_NOT_RESULTSET => + 'Iterator data is not a DBIx::Class::Resultset', + + ITERATOR_DATA_NOT_RESULTS_ITERATOR => + 'Iterator data is not an iterator', + + NO_RESULT => + 'No result exists or result not supplied', + + NOT_CLASS_METHOD => + 'Not a class method', + + NOT_OBJECT_METHOD => + 'Not an object method', + + FVS_REQUIRES_ARRAYREF => + 'FormValidator::Simple requires an ARRAYREF based profile', + + DFV_REQUIRES_HASHREF => + 'Data::FormValidator requires an HASHREF based profile', + + PLUGIN_HAS_NO_REGISTER => + 'Attempt to register plugin that hasn\'t defined register', + + ADD_CONSTRAINT_EXISTING_SCHEMA => + 'Can not add constraints to an existing schema instance', + + REMOVE_CONSTRAINT_EXISTING_SCHEMA => + 'Can not remove constraints to an existing schema instance', + + SETUP_EXISTING_SCHEMA => + 'A schema instance has already been initialized', + + COMPDATA_EXISTING_SCHEMA => + 'Can not assign [_1] to an existing schema instance', + + ITEM_RELATIONSHIP_NOT_SPECIFIED => + 'No item relationship defined', + + ITEM_STORAGE_NOT_DEFINED => + 'No item storage or item storage class defined', + + SCHEMA_SOURCE_NOT_SPECIFIED => + 'No schema_source is specified', + + SCHEMA_CLASS_NOT_SPECIFIED => + 'No schema_class is specified', + + SCHEMA_SOURCE_NO_RELATIONSHIP => + 'The source [_1] has no relationship named [_2]', + + TAG_NOT_ALLOWED_IN_OTHERS => + 'Tag [_1] not valid inside of other Handel tags', + + TAG_NOT_ALLOWED_HERE => + 'Tag [_1] not valid here', + + TAG_NOT_ALLOWED_IN_TAG => + 'Tag [_1] not valid inside of tag [_2]', + + NO_COLUMN_ACCESSORS => + 'Storage did not return any column accessors', ); 1; @@ -25,4 +218,4 @@ Handel::L10N::en_us - Handel Language Pack: US English Christopher H. Laco CPAN ID: CLACO claco@chrislaco.com - http://today.icantfocus.com/blog/ \ No newline at end of file + http://today.icantfocus.com/blog/ lib/Handel/L10N/en_us.pm @@ -1,101 +1,209 @@ +## no critic # $Id$ package Handel::L10N::fr; use strict; use warnings; use utf8; -use vars qw(%Lexicon); +use vars qw/%Lexicon/; BEGIN { - use base 'Handel::L10N'; + use base qw/Handel::L10N/; }; %Lexicon = ( - "Language" => - "Français", + Language => 'Français', - ## Base exceptions - "An unspecified error has occurred" => - "Une erreur non spécifiée s'est produite", + COMPAT_DEPRECATED => + 'Handel::Compat est obsolète et sera retiré dans la prochaine version.', - "The supplied field(s) failed database constraints" => - "Le champ recu n'a pas satisfait aux contraintes de base de données", + COMPCLASS_NOT_LOADED => + 'The component class [_1] [_2] could not be loaded', - "The argument supplied is invalid or of the wrong type" => - "L'argument fourni est invalide ou du type inapproprié", + PARAM1_NOT_HASHREF => + 'Le paramètre 1 n\'est pas une référence à un tableau associatif (HASH)', - "Required modules not found" => - "Modules requis non trouvés", + PARAM1_NOT_HASHREF_CARTITEM => + 'Le paramètre 1 n\'est pas une référence à un tableau associatif (HASH) ou un Handel::Cart::Item', - "The quantity requested ([_1]) is greater than the maximum quantity allowed ([_2])" => - "La quantité demandé ([_1]) est plus grande que la quantité maximale permise ([_2])", + PARAM1_NOT_HASHREF_CART => + 'Le paramètre 1 n\'est pas une référence à un tableau associatif (HASH) ou un Handel::Cart', - "An error occurred while while creating or validating the current order" => - "Une erreur s'est produite lors de la validation ou de la creation de la commande en cours", + PARAM1_NOT_HASHREF_ORDER => + 'Le paramètre 1 n\'est pas une référence à un tableau associatif (HASH) ou un Handel::Order', - "An error occurred during the checkout process" => - "Une erreur s'est produite pendant le processus de paiement", + PARAM1_NOT_CHECKOUT_PHASE => + 'Le paramètre 1 n\'est pas une valeur CHECKOUT_PHASE_*', - ## param 1 violations - "Param 1 is not a HASH reference" => - "Le parametre 1 n'est pas une reference a un tableau associatif (HASH)", + PARAM1_NOT_CODEREF => + 'Le paramètre 1 n\'est pas une référence CODE', - "Cart reference is not a HASH reference or Handel::Cart" => - "La reference au panier (Cart) n'est pas une reference a un tableau associatif (HASH) ou un Handel::Cart", + PARAM1_NOT_CHECKOUT_MESSAGE => + 'Le paramètre 1 n\'est pas un objet Handel::Checkout::Message ou un message texte', - "Param 1 is not a HASH reference or Handel::Cart::Item" => - "Le parametre 1 n'est pas une reference a un tableau associatif (HASH) ou a un Handel::Cart::Item", + PARAM1_NOT_HASH_CARTITEM_ORDERITEM => + 'Le paramètre 1 n\'est pas une référence à un tableau associatif (HASH) ou un Handel::Cart::Item ou un Handel::Order::Item', - "Param 1 is not a HASH reference, Handel::Order::Item or Handel::Cart::Item" => - "Le parametre 1 n'est pas une reference a un tableau associatif (HASH) ou a un Handel::Order::Item ou un Handel::Cart::Item", + PARAM1_NOT_ARRAYREF_STRING => + 'Le paramètre 1 n\'est pas une référence à un tableau ou une chaine de caractères', - "Unknown restore mode" => - "Mode inconnu de restauration", + PARAM2_NOT_HASHREF => + 'Le paramètre 2 n\'est pas une référence à un tableau associatif (HASH)', - "Currency code '[_1]' is invalid or malformed" => - "Le code de devise '[_1]' est invalide ou mal formé", + CARTPARAM_NOT_HASH_CART => + 'La référence Panier n\'est pas une référence à un tableau associatif (HASH) ou un Handel::Cart', - "Param 1 is not a a valid CHECKOUT_PHASE_* value" => - "Le parametre 1 n'est pas une valeur valide de CHECKOUT_PHASE_*", + COLUMN_NOT_SPECIFIED => + 'Aucune colonne spécifiée', - "Param 1 is not a CODE reference" => - "Le parametre 1 n'est pas une référence de CODE", + COLUMN_NOT_FOUND => + 'La colonne [_1] n\'a pas été trouvée', - "Param 1 is not an ARRAY reference" => - "Le parametre 1 n'est pas une référence de TABLEAU", + COLUMN_VALUE_EXISTS => + 'La valeur [_1] existe déjà', - "Param 1 is not an ARRAY reference or string" => - "Le parametre 1 n'est pas une référence de TABLEAU ou de chaine de caracteresE", + CONSTRAINT_NAME_NOT_SPECIFIED => + 'Aucun nom de contrainte spécifié', - "Param 1 is not a HASH reference, Handel::Order object, or order id" => - "Le parametre 1 n'est pas une référence a un tableau associatif (HASH), un objet de Handel::Cart, ou un identifiant de commande", + CONSTRAINT_NOT_SPECIFIED => + 'Aucune contrainte spécifiée', - "Param 1 is not a Handel::Checkout::Message object or text message" => - "Le parametre 1 n'est pas un message de texte ni un objet de Handel::Checkout::Message", + UNKNOWN_RESTORE_MODE => + 'Mode de restauration inconnu', - ## Taglib exceptions - "Tag '[_1]' not valid inside of other Handel tags" => - "L'étiquette '[_1] 'ne peut resider a l'interieur d'autres étiquettes de Handel", + HANDLER_EXISTS_IN_PHASE => + 'Il y a déjà un handler en phase ([_1]) pour la préférence ([_2]) depuis le plugin ([_3])', - "Tag '[_1]' not valid here" => - "Étiquette '[_1]' nvalide ici", + CONSTANT_NAME_ALREADY_EXISTS => + 'Une constante appelée [_1] existe déjà dans Handel::Constants', - ## naughty bits - "has invalid value" => - "a une valeur invalide", + CONSTANT_VALUE_ALREADY_EXISTS => + 'Une valeur constante de phase de [_1] existe déjà', - "[_1] value already exists" => - "la valeur [_1] existe déjà", + CONSTANT_EXISTS_IN_CALLER => + 'Une constante appelée [_1] existe déjà dans l\'appel [_2]', - ## Order exceptions - "Could not find a cart matching the supplid search criteria" => - "N'a pas pu trouver un panier correspondant aux critères de recherche fournis", + NO_ORDER_LOADED => + 'Aucune commande n\'est associée a ce processus de paiement', - "Could not create a new order because the supplied cart is empty" => - "Impossible de créer une nouvelle commande parce que le panier fourni est vide", + CART_NOT_FOUND => + 'Aucun panier ne correspondant aux critères de recherche fournis', - ## Checkout exception - "No order is assocated with this checkout process" => - "Aucune commande n'est associee a ce processus de paiement", + ORDER_NOT_FOUND => + 'Aucune commande ne correspondant aux critères de recherche fournis', + + ORDER_CREATE_FAILED_CART_EMPTY => + 'Impossible de créer une nouvelle commande, le panier fourni est vide', + + ROLLBACK_FAILED => + 'Transaction abandonnée. Echec de Rollback [_1]', + + QUANTITY_GT_MAX => + 'La quantité demandé ([_1]) est plus grande que la quantité maximale permise ([_2])', + + CURRENCY_CODE_INVALID => + 'Le code devise [_1] est invalide ou malformé', + + UNHANDLED_EXCEPTION => + 'Une erreur non spécifiée s\'est produite', + + CONSTRAINT_EXCEPTION => + 'Le champ recu ne respecte pas les contraintes de la base de données', + + ARGUMENT_EXCEPTION => + 'L\'argument fourni est invalide ou d\'un mauvais type', + + XSP_TAG_EXCEPTION => + 'L\'étiquette est hors de portée ou il manque les étiquettes filles réquises', + + ORDER_EXCEPTION => + 'Une erreur s\'est produite lors de la validation ou de la création de la commande en cours', + + CHECKOUT_EXCEPTION => + 'Une erreur s\'est produite pendant le processus de paiement', + + STORAGE_EXCEPTION => + 'Une erreur s\'est produite pendant le chargement du stockage', + + VALIDATION_EXCEPTION => + 'Echec de la validation, les données ne peuvent pas être enregistré', + + VIRTUAL_METHOD => + 'Les méthodes virtuels ne sont pas implémentés', + + NO_STORAGE => + 'Le stockage n\'est pas fourni', + + NO_RESULT_CLASS => + 'Le résultat de la classe n\'est pas fourni', + + NO_ITERATOR_DATA => + 'Les données d\'itération ne sont pas fournies', + + ITERATOR_DATA_NOT_ARRAYREF => + 'Les données d\'itération ne sont pas une référence à un tableau', + + ITERATOR_DATA_NOT_RESULTSET => + 'Les données d\'itération ne sont pas un DBIx::Class::Resultset', + + ITERATOR_DATA_NOT_RESULTS_ITERATOR => + 'Les données d\'itération ne sont pas une itération', + + NO_RESULT => + 'Aucun résultat ou résultat non fourni', + + NOT_CLASS_METHOD => + 'N\'est pas une méthode de la classe', + + NOT_OBJECT_METHOD => + 'N\'est pas une méthode de l\'objet', + + FVS_REQUIRES_ARRAYREF => + 'FormValidator::Simple a besoin d\'un profil sous forme de référence à un tableau', + + DFV_REQUIRES_HASHREF => + 'Data::FormValidator a besoin d\'un profil sous forme de référence à un tableau associatif (HASH)', + + PLUGIN_HAS_NO_REGISTER => + 'Tentative d\'enregistrement d\'un plugin sans définition d\'enregistrement', + + ADD_CONSTRAINT_EXISTING_SCHEMA => + 'Ne peut pas ajouter des contraintes à une instance de schéma existante', + + REMOVE_CONSTRAINT_EXISTING_SCHEMA => + 'Ne peut pas enlever des contraintes à une instance de schéma existante', + + SETUP_EXISTING_SCHEMA => + 'Une instance de schéma a déjà été initialisé', + + COMPDATA_EXISTING_SCHEMA => + 'Ne peut pas assigner [_1] à une instance d\'un schéma existant', + + ITEM_RELATIONSHIP_NOT_SPECIFIED => + 'Aucun élément de relation défini', + + ITEM_STORAGE_NOT_DEFINED => + 'Aucun élément de stockage ou d\'élément classe de stockage défini ', + + SCHEMA_SOURCE_NOT_SPECIFIED => + 'Aucun schema_source spécifié', + + SCHEMA_CLASS_NOT_SPECIFIED => + 'Aucun schema_class spécifié', + + SCHEMA_SOURCE_NO_RELATIONSHIP => + 'La source [_1] n\'a pas de relation appelée [_2]', + + TAG_NOT_ALLOWED_IN_OTHERS => + 'Étiquette [_1] invalide à l\'intérieur d\'autres étiquettes Handel', + + TAG_NOT_ALLOWED_HERE => + 'Étiquette [_1] invalide ici', + + TAG_NOT_ALLOWED_IN_TAG => + 'Étiquette [_1] invalide à l\'intérieur de l\'étiquettes [_2]', + + NO_COLUMN_ACCESSORS => + 'Le stockage ne retourne pas d\'accès aux colonnes', ); 1; @@ -110,4 +218,6 @@ Handel::L10N::fr - Handel Language Pack: French Christopher H. Laco CPAN ID: CLACO claco@chrislaco.com - http://today.icantfocus.com/blog/ \ No newline at end of file + http://today.icantfocus.com/blog/ + + Translation : Pierrick DINTRAT lib/Handel/L10N/fr.pm @@ -4,95 +4,76 @@ use strict; use warnings; BEGIN { - use base 'Handel::DBI'; - use Handel::Cart; - use Handel::Checkout; - use Handel::Constants qw(:checkout :returnas :order); - use Handel::Constraints qw(:all); + use Handel::Constants qw/:checkout :order/; + use Handel::Constraints qw/:all/; use Handel::Currency; - use Handel::L10N qw(translate); - - __PACKAGE__->mk_classdata(_cart_class => 'Handel::Cart'); - __PACKAGE__->mk_classdata(_item_class => 'Handel::Order::Item'); + use Handel::L10N qw/translate/; + use Scalar::Util qw/blessed/; + use Carp qw/carp/; + + use base qw/Handel::Base/; + __PACKAGE__->item_class('Handel::Order::Item'); + __PACKAGE__->cart_class('Handel::Cart'); + __PACKAGE__->checkout_class('Handel::Checkout'); + __PACKAGE__->storage_class('Handel::Storage::DBIC::Order'); + __PACKAGE__->mk_group_accessors('inherited', qw/ccn cctype ccm ccy ccvn ccname ccissuenumber ccstartdate ccenddate/); + __PACKAGE__->create_accessors; }; -__PACKAGE__->autoupdate(1); -__PACKAGE__->table('orders'); -__PACKAGE__->iterator_class('Handel::Iterator'); -__PACKAGE__->columns(All => qw(id shopper type number created updated comments - shipmethod shipping handling tax subtotal total - billtofirstname billtolastname billtoaddress1 billtoaddress2 billtoaddress3 - billtocity billtostate billtozip billtocountry billtodayphone - billtonightphone billtofax billtoemail shiptosameasbillto - shiptofirstname shiptolastname shiptoaddress1 shiptoaddress2 shiptoaddress3 - shiptocity shiptostate shiptozip shiptocountry shiptodayphone - shiptonightphone shiptofax shiptoemail) -); -__PACKAGE__->columns( - TEMP => qw(ccn cctype ccm ccy ccvn ccname ccissuenumber ccstartdate ccenddate) -); - -__PACKAGE__->has_many(_items => 'Handel::Order::Item', 'orderid'); -__PACKAGE__->has_a(subtotal => 'Handel::Currency'); -__PACKAGE__->has_a(total => 'Handel::Currency'); -__PACKAGE__->has_a(shipping => 'Handel::Currency'); -__PACKAGE__->has_a(handling => 'Handel::Currency'); -__PACKAGE__->has_a(tax => 'Handel::Currency'); - -__PACKAGE__->add_constraint('id', id => \&constraint_uuid); -__PACKAGE__->add_constraint('shopper', shopper => \&constraint_uuid); -__PACKAGE__->add_constraint('type', type => \&constraint_order_type); -__PACKAGE__->add_constraint('shipping', shipping => \&constraint_price); -__PACKAGE__->add_constraint('handling', handling => \&constraint_price); -__PACKAGE__->add_constraint('subtotal', subtotal => \&constraint_price); -__PACKAGE__->add_constraint('tax', tax => \&constraint_price); -__PACKAGE__->add_constraint('total', total => \&constraint_price); - -sub new { - my ($self, $data, $process) = @_; +sub create { ## no critic (ProhibitExcessComplexity) + my ($self, $data, $opts) = @_; throw Handel::Exception::Argument( - -details => translate('Param 1 is not a HASH reference') . '.') unless - ref($data) eq 'HASH'; - - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; - }; + -details => translate('PARAM1_NOT_HASHREF') + ) unless ref($data) eq 'HASH'; ## no critic - if (!defined($data->{'type'})) { - $data->{'type'} = ORDER_TYPE_TEMP; + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; + my $process = $opts->{'process'} || 0; my $cart = delete $data->{'cart'}; - my $is_uuid = constraint_uuid($cart); if (defined $cart) { throw Handel::Exception::Argument( -details => - translate( - 'Cart reference is not a HASH reference or Handel::Cart') . '.') unless - (ref($cart) eq 'HASH' or UNIVERSAL::isa($cart, 'Handel::Cart') or $is_uuid); + translate('CARTPARAM_NOT_HASH_CART') + ) if ( + (ref($cart) && !blessed($cart) && ref($cart) ne 'HASH') || + (blessed($cart) && !$cart->isa('Handel::Cart')) + ); ## no critic if (ref $cart eq 'HASH') { - $cart = $self->cart_class->load($cart, RETURNAS_ITERATOR)->first; + $cart = $self->cart_class->search($cart)->first; throw Handel::Exception::Order( -details => - translate( - 'Could not find a cart matching the supplied search criteria') . '.') unless $cart; - } elsif ($is_uuid) { - $cart = $self->cart_class->load({id => $cart}, RETURNAS_ITERATOR)->first; + translate('CART_NOT_FOUND') + ) unless $cart; ## no critic + } elsif (!blessed($cart)) { + my ($primary_key) = $self->cart_class->storage->primary_columns; + + $cart = $self->cart_class->search({$primary_key => $cart})->first; throw Handel::Exception::Order( -details => - translate( - 'Could not find a cart matching the supplied search criteria') . '.') unless $cart; + translate('CART_NOT_FOUND') + ) unless $cart; ## no critic }; throw Handel::Exception::Order( -details => - translate( - 'Could not create a new order because the supplied cart is empty') . '.') unless - $cart->count > 0; + translate('ORDER_CREATE_FAILED_CART_EMPTY') + ) unless $cart->count > 0; ## no critic + }; + + if (defined $cart) { + if ($cart->can('shopper') && !defined $data->{'shopper'}) { + $data->{'shopper'} = $cart->shopper; + }; }; - my $order = $self->insert($data); + my $order = $self->create_instance( + $storage->create($data) + ); if (defined $cart) { $self->copy_cart($order, $cart); @@ -100,14 +81,14 @@ sub new { }; if ($process) { - my $checkout = Handel::Checkout->new; + my $checkout = $self->checkout_class->new; $checkout->order($order); my $status = $checkout->process([CHECKOUT_PHASE_INITIALIZE]); if ($status == CHECKOUT_STATUS_OK) { $checkout->order->update; } else { - $order->SUPER::delete; + $order->destroy; undef $order; }; undef $checkout; @@ -116,255 +97,200 @@ sub new { return $order; }; -sub cart_class { - my ($self, $cart_class) = @_; - - if ($cart_class) { - eval "require $cart_class"; - $self->_cart_class($cart_class); - }; - - return $self->_cart_class; -}; - sub copy_cart { my ($self, $order, $cart) = @_; - if ($cart->shopper && !$order->shopper) { - $order->shopper($cart->shopper); - }; - $order->subtotal($cart->subtotal); $order->update; + + return; }; sub copy_cart_items { my ($self, $order, $cart) = @_; - my $items = $cart->items(undef, RETURNAS_ITERATOR); - while (my $item = $items->next) { - my %copy; - - foreach (Handel::Cart::Item->columns) { - next if $_ =~ /^(id|cart)$/i; - $copy{$_} = $item->$_; - }; - - $copy{'id'} = $self->uuid unless Handel::Constraints::constraint_uuid($copy{'id'}); - $copy{'orderid'} = $order->id; - $copy{'total'} = $copy{'quantity'}*$copy{'price'}; - - $order->add_to__items(\%copy); + foreach my $item ($cart->items) { + $order->add($item); }; + + return; }; sub add { my ($self, $data) = @_; throw Handel::Exception::Argument( -details => - translate( - 'Param 1 is not a HASH reference, Handel::Cart::Item or Handel::Order::Item') . '.') unless - (ref($data) eq 'HASH' or $data->isa('Handel::Order::Item') or $data->isa('Handel::Cart::Item')); + translate('PARAM1_NOT_HASH_CARTITEM_ORDERITEM') + ) unless (ref($data) eq 'HASH' || $data->isa('Handel::Order::Item') || $data->isa('Handel::Cart::Item')); ## no critic - if (ref($data) eq 'HASH') { - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; - }; + my $result = $self->result; + my $storage = $result->storage; - return $self->add_to__items($data); + if (ref($data) eq 'HASH') { + return $self->item_class->create_instance( + $result->add_item($data) + ); } else { my %copy; - foreach ($data->columns) { - next if $_ =~ /^(id|orderid|cart)$/i; - $copy{$_} = $data->$_; - }; - if (UNIVERSAL::isa($data, 'Handel::Cart::Item')) { - $copy{'total'} = $data->total; + foreach ($storage->copyable_item_columns) { + if ($data->can($_)) { + $copy{$_} = $data->$_; + } elsif ($data->result->can($_)) { + $copy{$_} = $data->result->$_; + }; }; - $copy{'id'} = $self->uuid; - - return $self->add_to__items(\%copy); + return $self->item_class->create_instance( + $result->add_item(\%copy) + ); }; }; sub clear { my $self = shift; - $self->_items->delete_all; - - return undef; + return $self->result->delete_items; }; sub count { my $self = shift; - return $self->_items->count || 0; + return $self->result->count_items; }; sub delete { my ($self, $filter) = @_; throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($filter) eq 'HASH'; + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic - ## I'd much rather use $self->_items->search_like, but it doesn't work that - ## way yet. This should be fine as long as :weaken refs works. - return $self->item_class->search_like(%{$filter}, - orderid => $self->id)->delete_all; + return $self->result->delete_items($filter); }; sub destroy { - my ($self, $filter) = @_; + my ($self, $filter, $opts) = @_; - if (ref $self) { - $self->SUPER::delete; + if (blessed $self && !defined $filter) { + my $result = $self->result->delete; + if ($result) { + undef ($self); + }; + return $result; } else { throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($filter) eq 'HASH'; + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic - my $orders = $self->load($filter, RETURNAS_ITERATOR); - while (my $order = $orders->next) { - $order->clear; - $order->SUPER::delete; + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; - }; - - return; -}; - -sub item_class { - my ($class, $item_class) = @_; - - if ($item_class) { - eval "require $item_class"; - require version; - my $cdbiver = version->new(Class::DBI->VERSION); - - if ($cdbiver->numify < 3.000008) { - undef(*_items); - undef(*add_to__items); - __PACKAGE__->has_many(_items => $item_class, 'orderid'); - } else { - $class->has_many(_items => $item_class, 'orderid'); - }; - } else { - return $class->_item_class; + return $storage->delete($filter); }; }; sub items { - my ($self, $filter, $wantiterator) = @_; + my ($self, $filter, $opts) = @_; + my $result = $self->result; + my $storage = $result->storage; + + $filter ||= {}; + $opts ||= {}; throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless( - ref($filter) eq 'HASH' or !$filter); + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic - $wantiterator ||= RETURNAS_AUTO; - $filter ||= {}; + throw Handel::Exception::Argument( -details => + translate('PARAM2_NOT_HASHREF') + ) unless ref($opts) eq 'HASH'; ## no critic - my $wildcard = Handel::DBI::has_wildcard($filter); + my $results = $result->search_items($filter, $opts); + my $iterator = $self->item_class->result_iterator_class->new({ + data => $results, + result_class => $self->item_class + }); - ## If the filter as a wildcard, push it through a fresh search_like since it - ## doesn't appear to be available within a loaded object. - if ((wantarray && $wantiterator != RETURNAS_ITERATOR) || $wantiterator == RETURNAS_LIST) { - my @items = $wildcard ? - $self->item_class->search_like(%{$filter}, orderid => $self->id) : - $self->_items(%{$filter}); + return wantarray ? $iterator->all : $iterator; +}; - return @items; - } elsif ($wantiterator == RETURNAS_ITERATOR) { - my $iterator = $wildcard ? - $self->item_class->search_like(%{$filter}, orderid => $self->id) : - $self->_items(%{$filter}); +sub search { + my ($self, $filter, $opts) = @_; + my $class = blessed $self ? blessed $self : $self; - return $iterator; - } else { - my $iterator = $wildcard ? - $self->item_class->search_like(%{$filter}, orderid => $self->id) : - $self->_items(%{$filter}); - if ($iterator->count == 1 && $wantiterator != RETURNAS_ITERATOR && $wantiterator != RETURNAS_LIST) { - return $iterator->next; - } else { - return $iterator; - }; - }; -}; + $filter ||= {}; + $opts ||= {}; -sub load { - my ($self, $filter, $wantiterator) = @_; + throw Handel::Exception::Argument( -details => + translate('PARAM1_NOT_HASHREF') + ) unless ref($filter) eq 'HASH'; ## no critic throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless( - ref($filter) eq 'HASH' or !$filter); - - $wantiterator ||= RETURNAS_AUTO; - - ## only return array if wantarray and not explicitly asking for an iterator - ## or we've explicitly asked for a list/array - if ((wantarray && $wantiterator != RETURNAS_ITERATOR) || $wantiterator == RETURNAS_LIST) { - my @orders = $filter ? $self->search_like(%{$filter}) : - $self->retrieve_all; - return @orders; - ## return an iterator if explicitly asked for - } elsif ($wantiterator == RETURNAS_ITERATOR) { - my $iterator = $filter ? - $self->search_like(%{$filter}) : $self->retrieve_all; - - return $iterator; - ## full out auto - } else { - my $iterator = $filter ? - $self->search_like(%{$filter}) : $self->retrieve_all; + translate('PARAM2_NOT_HASHREF') + ) unless ref($opts) eq 'HASH'; ## no critic - if ($iterator->count == 1 && $wantiterator != RETURNAS_ITERATOR && $wantiterator != RETURNAS_LIST) { - return $iterator->next; - } else { - return $iterator; - }; + my $storage = delete $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; + + my $results = $storage->search($filter, $opts); + my $iterator = $self->result_iterator_class->new({ + data => $results, + result_class => $class + }); + + return wantarray ? $iterator->all : $iterator; +}; + +sub save { + my $self = shift; + $self->type(ORDER_TYPE_SAVED); + + return; }; sub reconcile { my ($self, $cart) = @_; - my $is_uuid = constraint_uuid($cart); - - if (defined $cart) { - throw Handel::Exception::Argument( -details => - translate( - 'Cart reference is not a HASH reference or Handel::Cart') . '.') unless - (ref($cart) eq 'HASH' or UNIVERSAL::isa($cart, 'Handel::Cart') or $is_uuid); + throw Handel::Exception::Argument( -details => + translate('CARTPARAM_NOT_HASH_CART') + ) if ( ## no critic + (ref($cart) && !blessed($cart) && ref($cart) ne 'HASH') || + (blessed($cart) && !$cart->isa('Handel::Cart')) + ); - if (ref $cart eq 'HASH') { - $cart = $self->cart_class->load($cart, RETURNAS_ITERATOR)->first; + if (ref $cart eq 'HASH') { + $cart = $self->cart_class->search($cart)->first; - throw Handel::Exception::Order( -details => - translate( - 'Could not find a cart matching the supplied search criteria') . '.') unless $cart; - } elsif ($is_uuid) { - $cart = $self->cart_class->load({id => $cart}, RETURNAS_ITERATOR)->first; + throw Handel::Exception::Order( -details => + translate('CART_NOT_FOUND') + ) unless $cart; ## no critic + } elsif (!blessed($cart)) { + my ($primary_key) = $self->cart_class->storage->primary_columns; - throw Handel::Exception::Order( -details => - translate( - 'Could not find a cart matching the supplied search criteria') . '.') unless $cart; - }; + $cart = $self->cart_class->search({$primary_key => $cart})->first; throw Handel::Exception::Order( -details => - translate( - 'Could not create a new order because the supplied cart is empty') . '.') unless - $cart->count > 0; + translate('CART_NOT_FOUND') + ) unless $cart; ## no critic }; + throw Handel::Exception::Order( -details => + translate('ORDER_CREATE_FAILED_CART_EMPTY') + ) unless $cart->count > 0; ## no critic + if ($self->subtotal != $cart->subtotal || $self->count != $cart->count) { $self->clear; $self->copy_cart($self, $cart); $self->copy_cart_items($self, $cart); }; + + return; }; 1; @@ -376,10 +302,12 @@ Handel::Order - Module for maintaining order contents =head1 SYNOPSIS - my $order = Handel::Order->new({ + use Handel::Order; + + my $order = Handel::Order->create({ id => '12345678-9098-7654-322-345678909876' }); - + my $iterator = $order->items; while (my $item = $iterator->next) { print $item->sku; @@ -389,54 +317,40 @@ Handel::Order - Module for maintaining order contents =head1 DESCRIPTION -C<Handel::Order> is a component for maintaining simple order records. - -While C<Handel::Order> subclasses L<Class::DBI>, it is strongly recommended that -you not use its methods unless it's absolutely necessary. Stick to the -documented methods here and you'll be safe should I decide to implement some -other data access mechanism. :-) +Handel::Order is a component for maintaining simple order records. =head1 CONSTRUCTOR -There are three ways to create a new order object. You can either pass a hashref -into C<new> containing all the required values needed to create a new order -record or pass a hashref into C<load> containing the search criteria to use -to load an existing order or set of orders. +=head2 create -B<BREAKING API CHANGE:> Starting in version 0.17_04, new no longer automatically -creates a checkout process for C<CHECKOUT_PHASE_INITIALIZE>. The C<$noprocess> -parameter has been renamed to C<$process>. The have the new order automatically -run a checkout process, set $process to 1. +=over -B<NOTE:> Starting in version 0.17_02, the cart is no longer required! You can -create an order record that isn't associated with a current cart. +=item Arguments: \%data [, \%options] -B<NOTE:> As of version 0.17_02, Order::subtotal and Order::Item:: total are -calculated once B<only> when creating an order from an existing cart. After that -order is created, any changes to items price/wuantity/totals and the orders subtotals -must be calculated manually and put into the database by the user though their methods. +=back -If the cart key is passed, a new order record will be created from the specified -carts contents. The cart key can be a cart id (uuid), a cart object, or a has reference -contain the search criteria to load matching carts. +Creates a new order object containing the specified data. -=over +If the cart key is passed, a new order record will be created from the specified +carts contents. The cart key can be a cart primary key value, a cart object, +or a hash reference contain the search criteria to load matching carts. -=item C<Handel::Order-E<gt>new(\%data [, $process])> +By default, new will use Handel::Cart to load the specified cart, unless you +have set C<cart_class> to use another class. - my $order = Handel::Order->new({ + my $order = Handel::Order->create({ shopper => '10020400-E260-11CF-AE68-00AA004A34D5', id => '111111111-2222-3333-4444-555566667777', cart => $cartobject }); - - my $order = Handel::Order->new({ + + my $order = Handel::Order->create({ shopper => '10020400-E260-11CF-AE68-00AA004A34D5', id => '111111111-2222-3333-4444-555566667777', cart => '11112222-3333-4444-5555-666677778888' }); - - my $order = Handel::Order->new({ + + my $order = Handel::Order->create({ shopper => '10020400-E260-11CF-AE68-00AA004A34D5', id => '111111111-2222-3333-4444-555566667777', cart => { @@ -445,48 +359,36 @@ contain the search criteria to load matching carts. } }); -=item C<Handel::Order-E<gt>load([\%filter, $wantiterator])> - - my $order = Handel::Order->load({ - id => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' - }); - -You can also omit \%filter to load all available orders. +The following options are available: - my @orders = Handel::Order->load(); +=over -In scalar context C<load> returns a C<Handel::Order> object if there is a single -result, or a L<Handel::Iterator> object if there are multiple results. You can -force C<load> to always return an iterator even if only one cart exists by -setting the C<$wantiterator> parameter to C<RETURNAS_ITERATOR>. +=item process - my $iterator = Handel::Order->load(undef, RETURNAS_ITERATOR); - while (my $item = $iterator->next) { - print $item->sku; - }; +When true, the newly created order will be run through the +C<CHECKOUT_PHASE_INITIALIZE> process before it is returned. -See L<Handel::Constants> for the available C<RETURNAS> options. +=item storage -A C<Handel::Exception::Argument> exception is thrown if the first parameter is -not a hashref. +A storage object to use to create a new order object. Currently, this storage +object B<must> have the same columns as the default storage object for the +current order class. =back =head1 METHODS -=head2 add(\%data) +=head2 add -You can add items to the order by supplying a hashref containing the -required name/values or by passing in a newly create Handel::Order::Item -object. If successful, C<add> will return a L<Handel::Order::Item> object -reference. +=over -Yes, I know. Why a hashref and not just a hash? So I can add new params -later if need be. Oh yeah, and "Because I Can". :-P +=item Arguments: \%data | $item -=over +=back -=item C<$cart-E<gt>add(\%data)> +Adds a new item to the current order and returns an instance of the item class +specified in order object storage. You can either pass the item data as a hash +reference: my $item = $cart->add({ shopper => '10020400-E260-11CF-AE68-00AA004A34D5', @@ -495,43 +397,94 @@ later if need be. Oh yeah, and "Because I Can". :-P price => 1.25 }); -=item C<$cart-E<gt>add($object)> +or pass an existing item: - my $item = Handel::Cart::Item->new({ - sku => 'SKU1234', - quantity => 1, - price => 1.25 - }); - ... - $cart->add($item); + $order->add( + $cart->items->first + ); + +When passing an existing cart/order item to add, all columns in the source item +will be copied into the destination item if the column exists in both the +destination and source, and the column isn't the primary key or the foreign +key of the item relationship. A C<Handel::Exception::Argument> exception is thrown if the first parameter -isn't a hashref or a C<Handel::Cart::Item> object. +isn't a hashref or an object that subclasses Handel::Cart::Item. + +=head2 cart_class + +=over + +=item Arguments: $order_class =back +Gets/sets the name of the class to use when loading existing cart into the +new order. By default, it loads carts using Handel::Cart. While you can set this +directly in your application, it's best to set it in a custom subclass of +Handel::Order. + + package CustomOrder; + use strict; + use warnings; + use base qw/Handel::Order/; + __PACKAGE__->cart_class('CustomCart'); + +=head2 checkout_class + +=over + +=item Arguments: $checkout_class + +=back + +Gets/sets the name of the checkout class to use when processing the new order +through the INITIALIZE phase if the C<process> flag is on. By default, it uses +Handel::Checkout. While you can set this directly in your application, it's best +to set it in a custom subclass of Handel::Order. + + package CustomOrder; + use strict; + use warnings; + use base qw/Handel::Order/; + __PACKAGE__->checkout_class('CustomCheckout'); + =head2 clear -This method removes all items from the current cart object. +Deletes all items from the current order. $cart->clear; +=head2 count + +Returns the number of items in the order object. + + my $numitems = $order->count; + =head2 copy_cart +=over + +=item Arguments: $order, $cart + +=back + When creating a new order from an existing cart, C<copy_cart> will be called to copy the carts contents into the new order object. If you are using custom cart or order subclasses, the default copy_cart will only copy the fields declared in Handel::Cart, ignoring any custom fields you may add. -To fix this, simply subclass Handel::Order and override copy_cart. As its +To fix this, simply subclass Handel::Order and override C<copy_cart>. As its parameters, it will receive the order and cart objects. package CustomOrder; - use base 'Handel::Order'; - + use strict; + use warnings; + use base qw/Handel::Order/; + sub copy_cart { my ($self, $order, $cart) = @_; - + # copy stock fields $self->SUPER::copy_cart($order, $cart); @@ -541,126 +494,180 @@ parameters, it will receive the order and cart objects. =head2 copy_cart_items +=over + +=item Arguments: $order, $cart + +=back + When creating a new order from an existing cart, C<copy_cart_items> will be -called to copy the cart items into the new order object items. If you are using -custom cart or order subclasses, the default copy_cart_item will only copy the -fields declared in Handel::Cart::Item, ignoring any custom fields you may add. +called to copy the cart items into the new order object. If you are using +custom cart or order subclasses, the default C<copy_cart_item> will only copy +the fields that in both the cart item and the order item schemas. -To fix this, simply subclass Handel::Order and override copy_cart. As its +To fix this, simply subclass Handel::Order and override C<copy_cart>. As its parameters, it will receive the order and cart objects. package CustomOrder; - use base 'Handel::Order'; - + use strict; + use warnings; + use base qw/Handel::Order/; + __PACKAGE__->cart_class('CustomCart'); - + sub copy_cart_items { my ($self, $order, $cart) = @_; my $items = $cart->items(undef, RETURNAS_ITERATOR); - + while (my $item = $items->next) { my %copy; - + foreach (CustomCart::Item->columns) { next if $_ =~ /^(id|cart)$/i; $copy{$_} = $item->$_; }; - + $copy{'id'} = $self->uuid unless constraint_uuid($copy{'id'}); $copy{'orderid'} = $order->id; $copy{'total'} = $copy{'quantity'}*$copy{'price'}; - + $order->add_to__items(\%copy); }; }; -=head2 delete(\%filter) +=head2 delete -This method deletes the order item(s) matching the supplied filter values and -returns the number of items deleted. +=over - if ( $cart->delete({id => '8D4B0BE1-C02E-11D2-A33D-00A0C94B8D0E'}) ) { - print 'Item deleted'; - }; +=item Arguments: \%filter -=head2 destroy(\%filter) +=back -When called used as an instance method, this will delete all items from the -current cart instance and delete the cart container. C<filter> will be ignored. +Deletes the item matching the supplied filter from the current order. -When called as a package method, this will delete all carts matching C<filter>. -A Handel::Exception::Argument exception will be thrown is C<filter> is not a -HASH reference. + $order->delete({ + sku => 'ABC-123' + }); -=head2 cart_class($orderclass) +=head2 destroy -Gets/Sets the name of the class to use when loading existing cart into the -new order. By default, it loads carts using Handel::Cart. While you can set this -directly in your application, it's best to set it in a custom subclass of -Handel::Order. +=over - package CustomOrder; - use base 'Handel::Order'; - __PACKAGE__->cart_class('CustomCart'); +=item Arguments: \%filter -=head2 item_class($classname) +=back -Gets/Sets the name of the class to be used when returning or creating order items. -While you can set this directly in your application, it's best to set it -in a custom subclass of Handel::Order. +Deletes entire orders (and their items) from the database. When called +as an object method, this will delete all items from the current order object +and deletes the order object itself. C<filter> will be ignored. - package CustomOrder; - use strict; - use warnings; - use base 'Handel::Order'; + $order->destroy; - __PACKAGE__->item_class('CustomOrder::CustomItem'; +When called as a class method, this will delete all orders matching C<filter>. - 1; + Handel::Order->destroy({ + shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E' + }); + +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception will be +thrown if C<filter> is not a HASH reference. + +=head2 items + +=over -=head2 items([\%filter, [$wantiterator]) +=item Arguments: \%filter [, \%options] -You can retrieve all or some of the items contained in the order via the C<items> -method. In a scalar context, items returns an iterator object which can be used -to cycle through items one at a time. In list context, it will return an array -containing all items. +=back + +Loads the current orders items matching the specified filter and returns a +L<Handel::Iterator|Handel::Iterator> in scalar context, or a list of items in +list context. my $iterator = $order->items; while (my $item = $iterator->next) { print $item->sku; }; - + my @items = $order->items; - ... - dosomething(\@items); - -When filtering the items in the order in scalar context, a -C<Handel::Order::Item> object will be returned if there is only one result. If -there are multiple results, a Handel::Iterator object will be returned -instead. You can force C<items> to always return a C<Handel::Iterator> object -even if only one item exists by setting the $wantiterator parameter to -C<RETURNAS_ITERATOR>. - - my $item = $order->items({sku => 'SKU1234'}, RETURNAS_ITERATOR); - if ($item->isa('Handel::Order::Item)) { - print $item->sku; - } else { - while ($item->next) { - print $_->sku; - }; + +By default, the items returned as Handel::Order::Item objects. To return +something different, set C<item_class> in the local C<storage> object. + +The following options are available: + +=over + +=item order_by + +Order the items by the column(s) and order specified. This option uses the SQL +style syntax: + + my $items = $order->items(undef, {order_by => 'sku ASC'}); + +=back + +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if parameter one isn't a hashref or undef. + +=head2 search + +=over + +=item Arguments: \%filter [, \%options] + +=back + +Loads existing orders matching the specified filter and returns a +L<Handel::Iterator|Handel::Iterator> in scalar context, or a list of orders in +list context. + + my $iterator = Handel::Order->search({ + shopper => 'D597DEED-5B9F-11D1-8DD2-00AA004ABD5E', + type => ORDER_TYPE_SAVED + }); + + while (my $order = $iterator->next) { + print $order->id; }; + + my @orders = Handel::Orders->search(); + +The following options are available: + +=over + +=item storage -See the C<RETURNAS> constants in L<Handel::Constants> for other options. +A storage object to use to load order objects. Currently, this storage +object B<must> have the same columns as the default storage object for the +current order class. + +=item order_by + +Order the items by the column(s) and order specified. This option uses the SQL +style syntax: + + my $orders = Handel::Order->search(undef, {order_by => 'updated DESC'}); + +=back -In list context, filtered items return an array of items just as when items is -called without a filter specified. +A L<Handel::Exception::Argument|Handel::Exception::Argument> exception is +thrown if the first parameter is not a hashref. - my @items - $order->items((sku -> 'SKU1%'}); +=head2 save -A C<Handel::Exception::Argument> exception is thrown if parameter one isn't a -hashref or undef. +Marks the current order type as C<ORDER_TYPE_SAVED>. -=head2 reconcile($cart) + $order->save + +=head2 reconcile + +=over + +=item Arguments: $cart_id | $cart | \%filter + +=back This method copies the specified carts items into the order only if the item count or the subtotal differ. @@ -668,233 +675,796 @@ count or the subtotal differ. The cart key can be a cart id (uuid), a cart object, or a hash reference contain the search criteria to load matching carts. + $order->reconcile('11111111-1111-1111-1111-111111111111'); + $order->reconcile({name => 'My Cart'}); + + my $cart = Handel::Cart->search({ + id => '11111111-1111-1111-1111-111111111111' + })->first; + $order->reconcile($cart); + +By default, new will use Handel::Cart to load the specified cart, unless you +have set C<cart_class>on in the local <storage> object to use another class. + +=head1 COLUMNS + +The following methods are mapped to columns in the default order schema. These +methods may or may not be available in any subclasses, or in situations where +a custom schema is being used that has different column names. + +=head2 id + +Returns the id of the current order. + + print $order->id; + +See L<Handel::Schema::Order/id> for more information about this column. + +=head2 shopper + +=over + +=item Arguments: $shopper + +=back + +Gets/sets the id of the shopper the order should be associated with. + + $order->shopper('11111111-1111-1111-1111-111111111111'); + print $order->shopper; + +See L<Handel::Schema::Order/shopper> for more information about this column. + +=head2 type + +=over + +=item Arguments: $type + +=back + +Gets/sets the type of the current order. Currently the two types allowed are: + +=over + +=item C<ORDER_TYPE_TEMP> + +The order is temporary and may be purged during any [external] cleanup process +after the designated amount of inactivity. + +=item C<ORDER_TYPE_SAVED> + +The order should be left untouched by any cleanup process and is available to +the shopper at any time. + +=back + + $order->type(ORDER_TYPE_SAVED); + print $order->type; + +See L<Handel::Schema::Order/type> for more information about this column. + +=head2 number + +=over + +=item Arguments: $number + +=back + +Gets/sets the order number. + + $order->number(1015275); + print $order->number; + +See L<Handel::Schema::Order/number> for more information about this column. + +=head2 created + +=over + +=item $datetime + +=back + +Gets/sets the date/time when the order was created. The date is returned as a +stringified L<DateTime|DateTime> object. + + $order->created('2006-04-11T12:34:65'); + print $order->created; + +See L<Handel::Schema::Order/created> for more information about this column. + +=head2 updated + +=over + +=item $datetime + +=back + +Gets/sets the date/time when the order was last updated. The date is returned +as a stringified L<DateTime|DateTime> object. + + $order->updated('2006-04-11T12:34:65'); + print $order->updated; + +See L<Handel::Schema::Order/updated> for more information about this column. + +=head2 comments + +=over + +=item $comments + +=back + +Gets/sets the comments for this order. + + $order->comments('Handel with care'); + print $order->comments; + +See L<Handel::Schema::Order/comments> for more information about this column. + +=head2 shipmethod + +=over + +=item $shipmethod + +=back + +Gets/sets the shipping method for this order. + + $order->shipmethod('UPS 2nd Day'); + print $order->shipmethod; + +See L<Handel::Schema::Order/shipmethod> for more information about this column. + +=head2 shipping + +=over + +=item Arguments: $price + +=back + +Gets/sets the shipping cost for the order item. The price is returned as a +stringified L<Handel::Currency|Handel::Currency> object. + + $item->shipping(12.95); + print $item->shipping; + print $item->shipping->format; + +See L<Handel::Schema::Order/shipping> for more information about this column. + +=head2 handling + +=over + +=item Arguments: $price + +=back + +Gets/sets the handling cost for the order item. The price is returned as a +stringified L<Handel::Currency|Handel::Currency> object. + + $item->handling(12.95); + print $item->handling; + print $item->handling->format; + +See L<Handel::Schema::Order/handling> for more information about this column. + +=head2 tax + +=over + +=item Arguments: $price + +=back + +Gets/sets the tax for the order item. The price is returned as a +stringified L<Handel::Currency|Handel::Currency> object. + + $item->tax(12.95); + print $item->tax; + print $item->tax->format; + +See L<Handel::Schema::Order/tax> for more information about this column. + +=head2 subtotal + +=over + +=item Arguments: $price + +=back + +Gets/sets the subtotal for the order item. The price is returned as a +stringified L<Handel::Currency|Handel::Currency> object. + + $item->subtotal(12.95); + print $item->subtotal; + print $item->subtotal->format; + +See L<Handel::Schema::Order/subtotal> for more information about this column. + +=head2 total + +=over + +=item Arguments: $price + +=back + +Gets/sets the total for the order item. The price is returned as a +stringified L<Handel::Currency|Handel::Currency> object. + + $item->total(12.95); + print $item->total; + print $item->total->format; + +See L<Handel::Schema::Order/total> for more information about this column. + =head2 billtofirstname -Gets/sets the bill to first name +=over + +=item Arguments: $firstname + +=back + +Gets/sets the bill to first name. + + $order->billtofirstname('Chistopher'); + print $order->billtofirstname; + +See L<Handel::Schema::Order/billtofirstname> for more information about this +column. =head2 billtolastname +=over + +=item Arguments: $lastname + +=back + Gets/sets the bill to last name + $order->billtolastname('Chistopher'); + print $order->billtolastname; + +See L<Handel::Schema::Order/billtolastname> for more information about this +column. + =head2 billtoaddress1 +=over + +=item Arguments: $address1 + +=back + Gets/sets the bill to address line 1 + $order->billtoaddress1('1234 Main Street'); + print $order->billtoaddress1; + +See L<Handel::Schema::Order/billtoaddress1> for more information about this +column. + =head2 billtoaddress2 +=over + +=item Arguments: $address2 + +=back + Gets/sets the bill to address line 2 + $order->billtoaddress2('Suite 34b'); + print $order->billtoaddress2; + +See L<Handel::Schema::Order/billtoaddress2> for more information about this +column. + + =head2 billtoaddress3 +=over + +=item Arguments: $address3 + +=back + Gets/sets the bill to address line 3 + $order->billtoaddress3('Floor 5'); + print $order->billtoaddress3; + +See L<Handel::Schema::Order/billtoaddress3> for more information about this +column. + =head2 billtocity +=over + +=item Arguments: $city + +=back + Gets/sets the bill to city + $order->billtocity('Smallville'); + print $order->billtocity; + +See L<Handel::Schema::Order/billtocity> for more information about this +column. + =head2 billtostate +=over + +=item Arguments: $state + +=back + Gets/sets the bill to state/province + $order->billtostate('OH'); + print $order->billtostate; + +See L<Handel::Schema::Order/billtostate> for more information about this +column. + =head2 billtozip +=over + +=item Arguments: $zip + +=back + Gets/sets the bill to zip/postal code + $order->billtozip('12345-6500'); + print $order->billtozip; + +See L<Handel::Schema::Order/billtozip> for more information about this +column. + =head2 billtocountry +=over + +=item Arguments: $country + +=back + Gets/sets the bill to country + $order->billtocountry('US'); + print $order->billtocountry; + +See L<Handel::Schema::Order/billtocountry> for more information about this +column. + =head2 billtodayphone +=over + +=item Arguments: $phone + +=back + Gets/sets the bill to day phone number + $order->billtodayphone('800-867-5309'); + print $order->billtodayphone; + +See L<Handel::Schema::Order/billtodayphone> for more information about this +column. + =head2 billtonightphone +=over + +=item Arguments: $phone + +=back + Gets/sets the bill to night phone number + $order->billtonightphone('800-867-5309'); + print $order->billtonightphone; + +See L<Handel::Schema::Order/billtonightphone> for more information about this +column. + =head2 billtofax +=over + +=item Arguments: $fax + +=back + Gets/sets the bill to fax number + $order->billtofax('888-132-4335'); + print $order->billtofax; + +See L<Handel::Schema::Order/billtofax> for more information about this +column. + =head2 billtoemail +=over + +=item Arguments: $email + +=back + Gets/sets the bill to email address -=head2 ccn* + $order->billtoemail('claco@chrislaco.com'); + print $order->billtoemail; -Gets/sets the credit cart number. +See L<Handel::Schema::Order/billtoemail> for more information about this +column. -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=head2 shiptosameasbillto -=head2 cctype* +=over -Gets/sets the credit cart type. +=item Arguments: 0|1 -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=back -=head2 ccm* +When true, the ship address is the same as the bill to address. -Gets/sets the credit cart expiration month. + $order->shiptosameasbillto(1); + print $order->shiptosameasbillto; -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +See L<Handel::Schema::Order/shiptosameasbillto> for more information about this +column. -=head2 ccy* +=head2 shiptofirstname -Gets/sets the credit cart expiration year. +=over -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=item Arguments: $firstname -=head2 ccvn* +=back -Gets/sets the credit cart verification number. +Gets/sets the ship to first name. -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. + $order->shiptofirstname('Chistopher'); + print $order->shiptofirstname; -=head2 ccname* +See L<Handel::Schema::Order/shiptofirstname> for more information about this +column. -Gets/sets the credit cart holders name as it appears on the card. +=head2 shiptolastname -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=over -=head2 ccissuenumber* +=item Arguments: $lastname -Gets/sets the credit cart issue number. +=back -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +Gets/sets the ship to last name -=head2 ccstartdate* + $order->shiptolastname('Chistopher'); + print $order->shiptolastname; -Gets/sets the credit cart start date. +See L<Handel::Schema::Order/shiptolastname> for more information about this +column. -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=head2 shiptoaddress1 -=head2 ccenddate* +=over -Gets/sets the credit cart end date. +=item Arguments: $address1 -B<NOTE:> This field is stored in memory for the life of the order instance and -is not a real database field. +=back -=head2 comments +Gets/sets the ship to address line 1 -Gets/sets the comments for this order + $order->shiptoaddress1('1234 Main Street'); + print $order->shiptoaddress1; -=head2 count +See L<Handel::Schema::Order/shiptoaddress1> for more information about this +column. -Gets the number of items in the order +=head2 shiptoaddress2 -=head2 created +=over -Gets/sets the created date of the order +=item Arguments: $address2 -=head2 handling +=back -Gets/sets the handling charge +Gets/sets the ship to address line 2 -=head2 id + $order->shiptoaddress2('Suite 34b'); + print $order->shiptoaddress2; -Gets/sets the record id +See L<Handel::Schema::Order/shiptoaddress2> for more information about this +column. -=head2 number -Gets/sets the order number +=head2 shiptoaddress3 -=head2 shipmethod +=over -Gets/sets the shipping method +=item Arguments: $address3 -=head2 shipping +=back -Gets/sets the shipping cost +Gets/sets the ship to address line 3 -=head2 shiptosameasbillto + $order->shiptoaddress3('Floor 5'); + print $order->shiptoaddress3; -Gets/sets the ship to same as bill to flag. When set, the ship to information -will be copied from the bill to +See L<Handel::Schema::Order/shiptoaddress3> for more information about this +column. -=head2 shiptofirstname +=head2 shiptocity -Gets/sets the ship to first name +=over -=head2 shiptolastname +=item Arguments: $city -Gets/sets the ship to last name +=back -=head2 shiptoaddress1 +Gets/sets the ship to city -Gets/sets the ship to address line 1 + $order->shiptocity('Smallville'); + print $order->shiptocity; -=head2 shiptoaddress2 +See L<Handel::Schema::Order/shiptocity> for more information about this +column. -Gets/sets the ship to address line 2 +=head2 shiptostate -=head2 shiptoaddress3 +=over -Gets/sets the ship to address line 3 +=item Arguments: $state -=head2 shiptocity +=back -Gets/sets the ship to city +Gets/sets the ship to state/province -=head2 shiptostate + $order->shiptostate('OH'); + print $order->shiptostate; -Gets/sets the ship to state +See L<Handel::Schema::Order/shiptostate> for more information about this +column. =head2 shiptozip +=over + +=item Arguments: $zip + +=back + Gets/sets the ship to zip/postal code + $order->shiptozip('12345-6500'); + print $order->shiptozip; + +See L<Handel::Schema::Order/shiptozip> for more information about this +column. + =head2 shiptocountry +=over + +=item Arguments: $country + +=back + Gets/sets the ship to country + $order->shiptocountry('US'); + print $order->shiptocountry; + +See L<Handel::Schema::Order/shiptocountry> for more information about this +column. + =head2 shiptodayphone +=over + +=item Arguments: $phone + +=back + Gets/sets the ship to day phone number + $order->shiptodayphone('800-867-5309'); + print $order->shiptodayphone; + +See L<Handel::Schema::Order/shiptodayphone> for more information about this +column. + =head2 shiptonightphone +=over + +=item Arguments: $phone + +=back + Gets/sets the ship to night phone number + $order->shiptonightphone('800-867-5309'); + print $order->shiptonightphone; + +See L<Handel::Schema::Order/shiptonightphone> for more information about this +column. + =head2 shiptofax +=over + +=item Arguments: $fax + +=back + Gets/sets the ship to fax number + $order->shiptofax('888-132-4335'); + print $order->shiptofax; + +See L<Handel::Schema::Order/shiptofax> for more information about this +column. + =head2 shiptoemail +=over + +=item Arguments: $email + +=back + Gets/sets the ship to email address -=head2 shopper + $order->shiptoemail('claco@chrislaco.com'); + print $order->shiptoemail; -Gets/sets the shopper id +See L<Handel::Schema::Order/shiptoemail> for more information about this +column. -=head2 subtotal +=head1 TEMPORARY COLUMNS -Gets/sets the orders subtotal +The following columns are really just methods to hold sensitive +order data that we don't want to actually store in the database. -=head2 tax +=head2 ccn + +=over -Gets/sets the orders tax +=item Arguments: $ccn -=head2 total +=back -Gets/sets the orders total +Gets/sets the credit cart number. -=head2 type + $order->ccn(4444333322221111); + print $order->ccn; -Gets/sets the order type +=head2 cctype -=head2 updated +=over + +=item Arguments: $type + +=back + +Gets/sets the credit cart type. + + $order->cctype('MasterCard'); + print $order->cctype; + +=head2 ccm + +=over + +=item Arguments: $month + +=back + +Gets/sets the credit cart expiration month. + + $order->ccm(1); + print $order->ccm; + +=head2 ccy + +=over + +=item Arguments: $year + +=back + +Gets/sets the credit cart expiration year. + + $order->ccyear(2010); + print $order->ccyear; + +=head2 ccvn + +=over + +=item Arguments: $cvvn + +=back + +Gets/sets the credit cart verification number. + + $order->cvvn(102); + print $order->cvvn; + +=head2 ccname + +=over + +=item Arguments: $name + +=back + +Gets/sets the credit cart holders name as it appears on the card. + + $order->ccname('CHRISTOPHER H. LACO'); + print $order->ccname; + +=head2 ccissuenumber + +=over + +=item Arguments: $number + +=back + +Gets/sets the credit cart issue number. + + $order->ccissuenumber(16544); + print $order->ccissuenumber; + +=head2 ccstartdate + +=over + +=item Arguments: $startdate + +=back + +Gets/sets the credit cart start date. + + $order->ccstartdate('1/2/2009'); + print $order->ccstartdate; + +=head2 ccenddate + +=over + +=item Arguments: $enddate + +=back + +Gets/sets the credit cart end date. + + $order->ccenddate('12/31/2011'); + print $order->ccenddate; + +=head1 SEE ALSO -Gets/sets the last updated date of the order +L<Handel::Order::Item>, L<Handel::Schema::Order>, L<Handel::Constants> =head1 AUTHOR lib/Handel/Order.pm @@ -4,37 +4,29 @@ use strict; use warnings; BEGIN { - use base 'Handel::DBI'; - use Handel::Constraints qw(:all); - use Handel::Currency; - use Handel::L10N qw(translate); + use base qw/Handel::Base/; + use Handel::L10N qw/translate/; + + __PACKAGE__->storage_class('Handel::Storage::DBIC::Order::Item'); + __PACKAGE__->create_accessors; }; -__PACKAGE__->table('order_items'); -__PACKAGE__->autoupdate(1); -__PACKAGE__->iterator_class('Handel::Iterator'); -__PACKAGE__->columns(All => qw(id orderid sku quantity price description total)); -__PACKAGE__->columns(Essential => qw(id orderid sku quantity price description total)); -__PACKAGE__->has_a(price => 'Handel::Currency'); -__PACKAGE__->has_a(total => 'Handel::Currency'); -__PACKAGE__->add_constraint('quantity', quantity => \&constraint_quantity); -__PACKAGE__->add_constraint('price', price => \&constraint_price); -__PACKAGE__->add_constraint('id', id => \&constraint_uuid); -__PACKAGE__->add_constraint('orderid', orderid => \&constraint_uuid); -__PACKAGE__->add_constraint('total', total => \&constraint_price); - -sub new { - my ($self, $data) = @_; +sub create { + my ($self, $data, $opts) = @_; throw Handel::Exception::Argument( -details => - translate('Param 1 is not a HASH reference') . '.') unless - ref($data) eq 'HASH'; + translate('PARAM1_NOT_HASHREF') + ) unless ref($data) eq 'HASH'; ## no critic - if (!defined($data->{'id'}) || !constraint_uuid($data->{'id'})) { - $data->{'id'} = $self->uuid; + no strict 'refs'; + my $storage = $opts->{'storage'}; + if (!$storage) { + $storage = $self->storage; }; - return $self->construct($data); + return $self->create_instance( + $storage->create($data) + ); }; 1; @@ -46,10 +38,12 @@ Handel::Order::Item - Module representing an individual order line item =head1 SYNOPSIS - my $order = Handel::Order->new({ + use Handel::Order; + + my $order = Handel::Order->create({ id => '12345678-9098-7654-322-345678909876' }); - + my $iterator = $order->items; while (my $item = $iterator->next) { print $item->sku; @@ -57,51 +51,172 @@ Handel::Order::Item - Module representing an individual order line item print $item->total; }; +=head1 DESCRIPTION + +Handel::Order::Item is used in two main ways. First, you can create or edit +order items individually: + + use Handel::Order::Item; + + my $item = Handel::Order::Item->create({ + cart => '11111111-1111-1111-1111-111111111111', + sku => '1234', + price => 1.23, + quantity => 1 + }); + +As a general rule, you probably want to add/edit items using the order objects +C<items> and C<add> methods below instead. + +Second, the C<items> method of any valid Handel::Order object returns a +collection of Handel::Order::Item objects: + + my @items = $order->items; + foreach (@items) { + print $_->sku; + }; + =head1 CONSTRUCTOR -=head2 new +=head2 create + +=over + +=item Arguments: \%data [, \%options] + +=back You can create a new C<Handel::Order::Item> object by calling the C<new> method: - my $item = Handel::Order::Item->new({ + my $item = Handel::Order::Item->create({ sku => '1234', price => 1.23, quantity => 1, total => 1.23 }); - + $item->quantity(2); - + print $item->total; -This is a lazy operation. No actual item record is created until the item object -is passed into the C<add> method of a C<Handel::Order> object. +The following options are available: -=head1 METHODS +=over -=head2 description +=item storage + +A storage object to use to create a new item object. Currently, this storage +object B<must> have the same columns as the default storage object for the +current item class. + +=back -Gets/sets the item description +=head1 COLUMNS + +The following methods are mapped to columns in the default order schema. +These methods may or may not be available in any subclasses, or in situations +where a custom schema is being used that has different column names. =head2 id -Gets/sets the item id +Returns the id of the current order item. -=head2 price + print $item->id; -Gets/sets the item price +See L<Handel::Schema::Order::Item/id> for more information about this column. -=head2 quantity +=head2 orderid + +Gets/sets the id of the order this item belongs to. -Gets/sets the item quantity + $item->order('11111111-1111-1111-1111-111111111111'); + print $item->order; + +See L<Handel::Schema::Order::Item/cart> for more information about this column. =head2 sku -Gets/sets the item sku +=over + +=item Arguments: $sku + +=back + +Gets/sets the sku (stock keeping unit/part number) for the order item. + + $item->sku('ABC123'); + print $item->sku; + +See L<Handel::Schema::Order::Item/sku> for more information about this column. + +=head2 quantity + +=over + +=item Arguments: $quantity + +=back + +Gets/sets the quantity, or the number of this item being purchased. + + $item->quantity(3); + print $item->quantity; + +By default, the value supplied will be checked against +L<Handel::Constraints/constraint_quantity> to verify it is within the valid +range of values. + +See L<Handel::Schema::Order::Item/quantity> for more information about this +column. + +=head2 price + +=over + +=item Arguments: $price + +=back + +Gets/sets the price for the order item. The price is returned as a stringified +L<Handel::Currency|Handel::Currency> object. + + $item->price(12.95); + print $item->price; + print $item->price->format; + + +See L<Handel::Schema::Order::Item/price> for more information about this column. =head2 total -Gets/sets the item total +Gets/sets the total price for the order item as a stringified +L<Handel::Currency|Handel::Currency> object. + + $item->total(12.95); + print $item->total; + print $item->total->format; + +See L<Handel::Schema::Order::Item/total> for more information about this column. + +=head2 description + +=over + +=item Arguments: $description + +=back + +Gets/sets the description for the current order item. + + $item->description('Best Item Ever'); + print $item->description; + +See L<Handel::Schema::Order::Item/description> for more information about this +column. + +=head1 SEE ALSO + +L<Handel::Order>, L<Handel::Schema::Order::Item>, L<Handel::Currency> =head1 AUTHOR lib/Handel/Order/Item.pm @@ -2,13 +2,12 @@ package Template::Plugin::Handel::Cart; use strict; use warnings; -use base 'Template::Plugin'; -use Handel::Cart; +use base qw/Template::Plugin/; use Handel::Constants (); sub new { my ($class, $context, @params) = @_; - my $self = bless {_CONTEXT => $context}, $class; + my $self = bless {_CONTEXT => $context}, 'Template::Plugin::Handel::Cart::Proxy'; foreach my $const (@Handel::Constants::EXPORT_OK) { if ($const =~ /^[A-Z]{1}/) { @@ -24,25 +23,33 @@ sub load { return $class; }; -sub create { +package Template::Plugin::Handel::Cart::Proxy; +use strict; +use warnings; +use base qw/Handel::Cart/; + +__PACKAGE__->init_storage; + +sub search { my ($self, $filter) = @_; + my $iterator = $self->SUPER::search($filter); - return Handel::Cart->new($filter); + return $iterator; }; -sub fetch { - my ($self, $filter, $wantiterator) = @_; - return Handel::Cart->load($filter, $wantiterator); -}; +sub items { + my ($self, $filter) = @_; + my $iterator = $self->SUPER::items($filter); -sub guid { - return shift->uuid; + return $iterator; }; sub uuid { - return Handel::Cart->uuid; + return shift->storage->new_uuid; }; +*guid = \&uuid; + 1; __END__ @@ -53,158 +60,26 @@ Template::Plugin::Handel::Cart - Template Toolkit plugin for shopping cart =head1 SYNOPSIS [% USE Handel.Cart %] - [% IF (cart = Handel.Cart.fetch(id => 'A2CCD312-73B5-4EE4-B77E-3D027349A055')) %] + [% IF (cart = Handel.Cart.search({id => 'A2CCD312-73B5-4EE4-B77E-3D027349A055'}).first) %] [% cart.name %] - [% FOREACH item IN cart.items %] + [% FOREACH item IN cart.items.all %] [% item.sku %] [% END %] [% END %] =head1 DESCRIPTION -C<Template::Plugin::Handel::Cart> is a TT2 (Template Toolkit 2) plugin for -C<Handel::Cart>. It's API is exactly the same as C<Handel::Cart> with a few -minor exceptions noted below. - -Since C<new> and C<load> are used by TT2 to load plugins, Handel::Carts -C<new> and C<load> can be accessed using C<create> and C<fetch>. +Template::Plugin::Handel::Cart is a TT2 (Template Toolkit 2) plugin for +Handel::Cart. It's API is exactly the same as Handel::Cart. -Starting in version C<0.08>, C<Handel::Constants> are now imported into this -module automatically. This removes the need to use -C<Template::Plugin::Handel::Constants> separately when working with carts. +Handel::Constants are imported into this module automatically. This removes +the need to use Template::Plugin::Handel::Constants separately when working +with carts. [% USE hc = Handel.Cart %] [% cart = hc.create(...) %] [% cart.type(hc.CART_TYPE_TEMP) %] -=head1 CAVEATS - -C<Template Toolkit> handles method params in a smart fashion that -allows you to pass named parameters into methods and it will convert them -into HASH references. - -For example: - - [% cart.method(name1=val1, name2=val2, otherarg); - -is turned into: - - cart->method(otherarg, {name1=>val1, name2=>val2}); - -Unfortunately, it looks like TT2 reverses the @ARGS order during translation. -This causes problems with C<Handel::Cart::load> and C<items> as they expect -C<($hashref, $wantiterator)> instead. - -Do to this, it is recommended that you always use the same explicit form as -you would use when calling C<Handel::Cart> when calling C<create> and C<items>: - - [% cart.method({name1=>val1, name2=>val2}, $wantiterator) %] - -Other issue is how C<Handel::Cart> returns an iterator or an array based on its -inspection of C<wantarray>. It appears that TT2 thwarts C<wantarray> in some -manner. - -For example: - - [% carts = Handel.Cart.fetch() %] - -returns an array reference since it's not clear at this point what you really -want. To counteract this behavior, you can use C<RETURNAS> constants to -specify the exact output desired: - - [% carts = Handel.Cart.fetch(undef, Handel.Cart.RETURNAS_ITERATOR) %] - -This will force a return of a C<Handel::Iterator> in scalar context. Then you -can simply loop through the iterator: - - [% WHILE (cart = carts.next) %] - ... - [% END %] - -On the upshot, if you are only expecting a single result, like loading a -specific cart by C<id>, then it will just do Do What You Want: - - [% cart = Handel.Cart.fetch({id => '12345678-7654-3212-345678987654'}) %] - [% cart.id %] - [% cart.name %] - ... - -You can even use C<FOREACH> without specifying the return type as TT2 appears -to just Do The Right Thing regardless of whether it receives an array or a -single C<Handel::Cart> or C<Handel::Cart::Item> object: - - [% FOREACH cart IN Handel.Cart.fetch({id => '12345678-7654-3212-345678987654'}}) %] - [% FOREACH item IN cart.items %] - [% item.sku %] - [% END %] - [% END %] - -=head1 CONSTRUCTOR - -Unlike using C<Handel::Cart> to create a new cart object using C<new> and -C<load>, C<Template::Plugin::Handel::Cart> takes a slightly different -approach to cart objects. Because C<USE>ing in TT2 calls C<new>, we first -C<USE> or create a new C<Template::Plugin::Handel::Cart> object then -C<create> or C<load> to return a new cart object, iterator, or array of carts. - -=head2 new - -This returns a new Handel.Cart object. This is used internally when -loading TT2 plugins and should not be used directly. - -=head1 METHODS - -=head2 load - -This method is called when TT2 loaded the plugin for the first time. -This is used internally by TT2 and should not be used directly. - -=head2 create(\%filter) - - [% USE Handel.Cart %] - [% IF (cart = Handel.Cart.create({ - shopper => '12345678-9876-5432-1234-567890987654', - name => 'My New Cart', - description =>'Favorite Items'})) %] - - [% cart.name %] - ... - - [% END %] - -=head2 fetch(\%filter [, $wantiterator]) - -The safest way to get a cart is to use FOREACH. This negates the need -to specify C<$wanteriterator> for C<Handel::Cart::load>. See L<CAVEATS> -for further info on C<$wantiterator>, Perls C<wantarray> within TT2. - - [% USE Handel.Cart %] - [% FOREACH cart IN Handel.Cart.fetch({shopper => '12345678-9876-5432-1234-567890987654'}) %] - [% cart.id %] - [% cart.name %] - ... - [% END %] - -=head2 uuid - -Returns a new uuid for use in add/create: - - [% USE Handel.Cart %] - [% IF (cart = Handel.Cart.create({ - id => Handel.Cart.uuid, - shopper => '12345678-9876-5432-1234-567890987654', - name => 'My New Cart', - description =>'Favorite Items'})) %] - - [% cart.name %] - ... - - [% END %] - -=head2 guid - -Same as C<uuid> above. - =head1 SEE ALSO L<Template::Plugin::Handel::Constants>, L<Handel::Constants>, L<Handel::Cart>, lib/Template/Plugin/Handel/Cart.pm @@ -2,13 +2,12 @@ package Template::Plugin::Handel::Checkout; use strict; use warnings; -use base 'Template::Plugin'; -use Handel::Checkout; +use base qw/Template::Plugin/; use Handel::Constants (); sub new { my ($class, $context, @params) = @_; - my $self = bless {_CONTEXT => $context}, $class; + my $self = bless {_CONTEXT => $context}, 'Template::Plugin::Handel::Checkout::Proxy'; foreach my $const (@Handel::Constants::EXPORT_OK) { if ($const =~ /^[A-Z]{1}/) { @@ -24,10 +23,24 @@ sub load { return $class; }; -sub create { - my ($self, $filter) = @_; +package Template::Plugin::Handel::Checkout::Proxy; +use strict; +use warnings; +use Template::Plugin::Handel::Order; +use base qw/Handel::Checkout/; + +sub new { + my $class = ref shift; + + return $class->SUPER::new(@_); +}; + +sub order { + my ($self, @args) = @_; + + my $order = $self->SUPER::order(@args); - return Handel::Checkout->new($filter); + return bless \%{$order}, 'Template::Plugin::Handel::Order::Proxy'; }; 1; @@ -40,7 +53,7 @@ Template::Plugin::Handel::Checkout - Template Toolkit plugin for checkout proces =head1 SYNOPSIS [% USE Handel.Checkout %] - [% IF (checkout = Handel.Checkout.create(order => 'A2CCD312-73B5-4EE4-B77E-3D027349A055')) %] + [% IF (checkout = Handel.Checkout.new({order => 'A2CCD312-73B5-4EE4-B77E-3D027349A055'})) %] [% checkout.process %] [% FOREACH message IN checkout.messages %] [% message.text %] @@ -49,70 +62,16 @@ Template::Plugin::Handel::Checkout - Template Toolkit plugin for checkout proces =head1 DESCRIPTION -C<Template::Plugin::Handel::Checkout> is a TT2 (Template Toolkit 2) plugin for -C<Handel::Checkout>. It's API is exactly the same as C<Handel::Checkout> with a few -minor exceptions noted below. - -Since C<new> is used by TT2 to load plugins, Handel::Checkouts -C<new> can be accessed using C<create>. - -Starting in version C<0.08>, C<Handel::Constants> are now imported into this -module automatically. This removes the need to use -C<Template::Plugin::Handel::Constants> separately when working with carts. - - [% USE hc = Handel.Constants %] - [% cart = hc.create(...) %] - [% cart.type(hc.CHECKOUT_PHASE_INITIALIZE) %] - -=head1 CAVEATS - -C<Template Toolkit> handles method params in a smart fashion that -allows you to pass named parameters into methods and it will convert them -into HASH references. - -For example: - - [% checkout.method(name1=val1, name2=val2, otherarg); +Template::Plugin::Handel::Checkout is a TT2 (Template Toolkit 2) plugin for +Handel::Checkout. It's API is exactly the same as Handel::Checkout. -is turned into: +Handel::Constants are imported into this module automatically. This removes +the need to use Template::Plugin::Handel::Constants separately when working +with checkout processes. - checkout->method(otherarg, {name1=>val1, name2=>val2}); - -Unfortunately, it looks like TT2 reverses the @ARGS order during translation. -This causes problems with C<Handel::Order::load> and C<items> as they expect -C<($hashref, $wantiterator)> instead. - -Do to this, it is recommended that you always use the same explicit form as -you would use when calling C<Handel::Checkout> when calling C<create> and C<items>: - - [% checkout.method({name1=>val1, name2=>val2}, $wantiterator) %] - - -=head1 CONSTRUCTOR - -Unlike using C<Handel::Checkout> to create a new checkout object using C<new>, -C<Template::Plugin::Handel::Checkout> takes a slightly different -approach to checkout objects. Because C<USE>ing in TT2 calls C<new>, we first -C<USE> or create a new C<Template::Plugin::Handel::Checkout> object then -C<create> to return a new checkout object. - -=head2 new - -This returns a new Handel.Checkout object. This is used internally when -loading TT2 plugins and should not be used directly. - -=head1 METHODS - -=head2 create(\%options) - - [% USE Handel.Checkout %] - [% IF (checkout = Handel.Checkout.create({ - order => '12345678-9876-5432-1234-567890987654'})) %] - - [% order.process %] - ... - - [% END %] + [% USE hc = Handel.Checkout %] + [% checkout = hc.new(...) %] + [% checkout.order.type(hc.CHECKOUT_PHASE_INITIALIZE) %] =head1 SEE ALSO lib/Template/Plugin/Handel/Checkout.pm @@ -2,12 +2,12 @@ package Template::Plugin::Handel::Constants; use strict; use warnings; -use base 'Template::Plugin'; +use base qw/Template::Plugin/; use Handel::Constants (); sub new { my ($class, $context, @params) = @_; - my $self = bless {_CONTEXT => $context}, ref($class) || $class; + my $self = bless {_CONTEXT => $context}, $class; foreach my $const (@Handel::Constants::EXPORT_OK) { if ($const =~ /^[A-Z]{1}/) { @@ -43,25 +43,11 @@ Template::Plugin::Handel::Constants - Template Toolkit plugin for constants =head1 DESCRIPTION -C<Template::Plugin::Handel::Constants> is a TT2 (Template Toolkit 2) plugin to -access C<Handel::Constants> inside of TT2 pages. +Template::Plugin::Handel::Constants is a TT2 (Template Toolkit 2) plugin to +access Handel::Constants inside of TT2 pages. It contains all of the exportable constants declared in -C<@Handel::Constants::EXPORT_OK>. - -=head1 CONSTRUCTOR - -=head2 new - -This returns a new Handel.Constants object. This is used internally when -loading TT2 plugins and should not be used directly. - -=head1 METHODS - -=head2 load - -This method is called when TT2 loaded the plugin for the first time. -This is used internally by TT2 and should not be used directly. +Handel::Constants::EXPORT_OK. =head1 SEE ALSO lib/Template/Plugin/Handel/Constants.pm @@ -2,13 +2,12 @@ package Template::Plugin::Handel::Order; use strict; use warnings; -use base 'Template::Plugin'; -use Handel::Order; +use base qw/Template::Plugin/; use Handel::Constants (); sub new { my ($class, $context, @params) = @_; - my $self = bless {_CONTEXT => $context}, $class; + my $self = bless {_CONTEXT => $context}, 'Template::Plugin::Handel::Order::Proxy'; foreach my $const (@Handel::Constants::EXPORT_OK) { if ($const =~ /^[A-Z]{1}/) { @@ -24,25 +23,33 @@ sub load { return $class; }; -sub create { +package Template::Plugin::Handel::Order::Proxy; +use strict; +use warnings; +use base qw/Handel::Order/; + +__PACKAGE__->init_storage; + +sub search { my ($self, $filter) = @_; + my $iterator = $self->SUPER::search($filter); - return Handel::Order->new($filter); + return $iterator; }; -sub fetch { - my ($self, $filter, $wantiterator) = @_; - return Handel::Order->load($filter, $wantiterator); -}; +sub items { + my ($self, $filter) = @_; + my $iterator = $self->SUPER::items($filter); -sub guid { - return shift->uuid; + return $iterator; }; sub uuid { - return Handel::Order->uuid; + return shift->storage->new_uuid; }; +*guid = \&uuid; + 1; __END__ @@ -53,155 +60,25 @@ Template::Plugin::Handel::Order - Template Toolkit plugin for orders =head1 SYNOPSIS [% USE Handel.Order %] - [% IF (order = Handel.Order.fetch(id => 'A2CCD312-73B5-4EE4-B77E-3D027349A055')) %] + [% IF (order = Handel.Order.search({id => 'A2CCD312-73B5-4EE4-B77E-3D027349A055'}).first) %] [% order.number %] - [% FOREACH item IN order.items %] + [% FOREACH item IN order.items.all %] [% item.sku %] [% END %] [% END %] =head1 DESCRIPTION -C<Template::Plugin::Handel::Order> is a TT2 (Template Toolkit 2) plugin for -C<Handel::Order>. It's API is exactly the same as C<Handel::Order> with a few -minor exceptions noted below. - -Since C<new> and C<load> are used by TT2 to load plugins, Handel::Orders -C<new> and C<load> can be accessed using C<create> and C<fetch>. - -Starting in version C<0.08>, C<Handel::Constants> are now imported into this -module automatically. This removes the need to use -C<Template::Plugin::Handel::Constants> separately when working with carts. - - [% USE hc = Handel.Constants %] - [% cart = hc.create(...) %] - [% cart.type(hc.ORDER_TYPE_TEMP) %] - -=head1 CAVEATS - -C<Template Toolkit> handles method params in a smart fashion that -allows you to pass named parameters into methods and it will convert them -into HASH references. - -For example: - - [% order.method(name1=val1, name2=val2, otherarg); - -is turned into: - - order->method(otherarg, {name1=>val1, name2=>val2}); - -Unfortunately, it looks like TT2 reverses the @ARGS order during translation. -This causes problems with C<Handel::Order::load> and C<items> as they expect -C<($hashref, $wantiterator)> instead. - -Do to this, it is recommended that you always use the same explicit form as -you would use when calling C<Handel::Order> when calling C<create> and C<items>: - - [% order.method({name1=>val1, name2=>val2}, $wantiterator) %] - -Another issue is how C<Handel::Order> returns an iterator or an array based on its -inspection of C<wantarray>. It appears that TT2 thwarts C<wantarray> in some -manner. - -For example: - - [% orders = Handel.Order.fetch() %] - -returns an array reference since it's not clear at this point what you really -want. To counteract this behavior, you can use C<RETURNAS> constants to -specify the exact output desired: - - [% orders = Handel.Order.fetch(undef, Handel.Order.RETURNAS_ITERATOR) %] - -This will force a return of a C<Handel::Iterator> in scalar context. Then you -can simply loop through the iterator: - - [% WHILE (order = orders.next) %] - ... - [% END %] - -On the upshot, if you are only expecting a single result, like loading a -specific cart by C<id>, then it will just do Do What You Want: - - [% order = Handel.Order.fetch({id => '12345678-7654-3212-345678987654'}) %] - [% order.id %] - [% order.number %] - ... - -You can even use C<FOREACH> without specifying the return type as TT2 appears -to just Do The Right Thing regardless of whether it receives an array or a -single C<Handel::Order> or C<Handel::Order::Item> object: - - [% FOREACH order IN Handel.Order.fetch({id => '12345678-7654-3212-345678987654'}}) %] - [% FOREACH item IN order.items %] - [% item.sku %] - [% END %] - [% END %] - -=head1 CONSTRUCTOR - -Unlike using C<Handel::Order> to create a new order object using C<new> and -C<load>, C<Template::Plugin::Handel::Order> takes a slightly different -approach to order objects. Because C<USE>ing in TT2 calls C<new>, we first -C<USE> or create a new C<Template::Plugin::Handel::Order> object then -C<create> or C<load> to return a new order object, iterator, or array of orders. - -=head2 new - -This returns a new Handel.Order object. This is used internally when -loading TT2 plugins and should not be used directly. - -=head1 METHODS - -=head2 load - -This method is called when TT2 loaded the plugin for the first time. -This is used internally by TT2 and should not be used directly. - -=head2 create(\%filter) - - [% USE Handel.Order %] - [% IF (order = Handel.Order.create({ - shopper => '12345678-9876-5432-1234-567890987654', - number => 'O123456789'})) %] - - [% cart.number %] - ... - - [% END %] - -=head2 fetch(\%filter [, $wantiterator]) - -The safest way to get a order is to use FOREACH. This negates the need -to specify C<$wanteriterator> for C<Handel::Order::load>. See L<CAVEATS> -for further info on C<$wantiterator>, Perls C<wantarray> within TT2. - - [% USE Handel.Order %] - [% FOREACH order IN Handel.Order.fetch({shopper => '12345678-9876-5432-1234-567890987654'}) %] - [% order.id %] - [% order.number %] - ... - [% END %] - -=head2 uuid - -Returns a new uuid for use in add/create: - - [% USE Handel.Order %] - [% IF (order = Handel.Order.create({ - id => Handel.Cart.uuid, - shopper => '12345678-9876-5432-1234-567890987654', - number => ')123456789'})) %] - - [% order.number %] - ... - - [% END %] +Template::Plugin::Handel::Order is a TT2 (Template Toolkit 2) plugin for +Handel::Order. It's API is exactly the same as Handel::Order. -=head2 guid +Handel::Constants are imported into this module automatically. This removes +the need to use Template::Plugin::Handel::Constants separately when working +with orders. -Same as C<uuid> above. + [% USE ho = Handel.Order %] + [% order = ho.create(...) %] + [% order.type(ho.ORDER_TYPE_TEMP) %] =head1 SEE ALSO lib/Template/Plugin/Handel/Order.pm @@ -43,8 +43,9 @@ CREATE TABLE orders ( billtocountry varchar(25) NULL, billtodayphone varchar(25) NULL, billtonightphone varchar(25) NULL, - billtofax varchar(25) NULL,billtoemail varchar(50) NULL, - shiptosameasbillto tinyint NOT NULL default '0', + billtofax varchar(25) NULL, + billtoemail varchar(50) NULL, + shiptosameasbillto tinyint(3) NOT NULL default '0', shiptofirstname varchar(25) NULL, shiptolastname varchar(25) NULL, shiptoaddress1 varchar(50) NULL, sql/handel.sqlite.sql @@ -2,26 +2,70 @@ # $Id$ use strict; use warnings; -use Test::More tests => 30; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 63; + use_ok('Handel'); + use_ok('Handel::Base'); use_ok('Handel::Cart'); use_ok('Handel::Cart::Item'); + use_ok('Handel::Cart::Schema'); use_ok('Handel::Checkout'); + use_ok('Handel::Checkout::Message'); use_ok('Handel::Checkout::Plugin'); + use_ok('Handel::Checkout::Plugin::MarkOrderSaved'); + use_ok('Handel::Checkout::Plugin::AssignOrderNumber'); use_ok('Handel::Checkout::Stash'); + use_ok('Handel::Compat::Currency'); + use_ok('Handel::Components::Constraints'); + use_ok('Handel::Components::DefaultValues'); + use_ok('Handel::Components::Validation'); + use_ok('Handel::ConfigReader'); use_ok('Handel::Constants'); use_ok('Handel::Constraints'); use_ok('Handel::Currency'); - use_ok('Handel::DBI'); use_ok('Handel::Exception'); use_ok('Handel::Iterator'); + use_ok('Handel::Iterator::DBIC'); + use_ok('Handel::Iterator::List'); + use_ok('Handel::Iterator::Results'); use_ok('Handel::L10N'); use_ok('Handel::L10N::en_us'); + use_ok('Handel::L10N::es_es'); use_ok('Handel::L10N::fr'); + use_ok('Handel::L10N::zh_tw'); use_ok('Handel::Order'); use_ok('Handel::Order::Item'); + use_ok('Handel::Order::Schema'); + use_ok('Handel::Schema'); + use_ok('Handel::Schema::DBIC::Cart'); + use_ok('Handel::Schema::DBIC::Cart::Item'); + use_ok('Handel::Schema::DBIC::Order'); + use_ok('Handel::Schema::DBIC::Order::Item'); + use_ok('Handel::Storage'); + use_ok('Handel::Storage::Result'); + use_ok('Handel::Storage::DBIC'); + use_ok('Handel::Storage::DBIC::Result'); + use_ok('Handel::Storage::DBIC::Cart'); + use_ok('Handel::Storage::DBIC::Cart::Item'); + use_ok('Handel::Storage::DBIC::Order'); + use_ok('Handel::Storage::DBIC::Order::Item'); + + { + ## no need for the deprected warnings here + local $SIG{__WARN__} = sub{}; + + use_ok('Handel::Compat'); + }; + + SKIP: { + eval 'use Module::Starter'; + skip 'Module::Starter not installed', 1 if $@; + + use_ok('Module::Starter::Handel'); + }; SKIP: { eval 'use Apache::AxKit::Language::XSP'; @@ -48,14 +92,17 @@ BEGIN { }; SKIP: { - eval 'use Catalyst 5.56'; - skip 'Catalyst 5.56 not installed', 6 if $@; + eval 'use Catalyst 5.7001'; + skip 'Catalyst 5.7001 not installed', 9 if $@; + use_ok('Catalyst::Helper::Handel'); use_ok('Catalyst::Helper::Handel::Scaffold'); use_ok('Catalyst::Helper::Controller::Handel::Cart'); use_ok('Catalyst::Helper::Controller::Handel::Checkout'); use_ok('Catalyst::Helper::Controller::Handel::Order'); use_ok('Catalyst::Helper::Model::Handel::Cart'); use_ok('Catalyst::Helper::Model::Handel::Order'); + use_ok('Catalyst::Model::Handel::Cart'); + use_ok('Catalyst::Model::Handel::Order'); }; }; t/basic.t @@ -2,20 +2,22 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 156; + plan tests => 252; }; use_ok('Handel::Cart'); + use_ok('Handel::Cart::Item'); use_ok('Handel::Subclassing::Cart'); + use_ok('Handel::Subclassing::CartItem'); use_ok('Handel::Subclassing::CartOnly'); use_ok('Handel::Constants', ':cart'); use_ok('Handel::Exception', ':try'); @@ -23,6 +25,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,34 +34,23 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_add_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## test for Handel::Exception::Argument where first param is not a hashref ## or Handle::Cart::Item subclass { try { + local $ENV{'LANG'} = 'en'; my $newitem = $subclass->add(id => '1234'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a hash/i, 'not a hash ref in message'); } otherwise { - fail; + fail('caught other exception'); }; }; @@ -66,23 +59,29 @@ sub run { ## or Handle::Cart::Item subclass { try { + local $ENV{'LANG'} = 'en'; my $fakeitem = bless {}, 'FakeItem'; my $newitem = $subclass->add($fakeitem); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a hash.*Handel::Cart::Item/i, 'not a cart in message'); } otherwise { - fail; + fail('caught other exception'); }; }; ## add a new item by passing a hashref { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'returned 1 item'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); @@ -99,37 +98,45 @@ sub run { my $item = $cart->add($data); isa_ok($item, 'Handel::Cart::Item'); isa_ok($item, $itemclass); - is($item->cart, $cart->id); - is($item->sku, 'SKU9999'); - is($item->quantity, 2); - is($item->price, 1.11); - is($item->description, 'Line Item SKU 9'); - is($item->total, 2.22); + is($item->cart, $cart->id, 'cart is set'); + is($item->sku, 'SKU9999', 'got sku'); + is($item->quantity, 2, 'quantity is 2'); + is($item->price+0, 1.11, 'price is 1.11'); + is($item->description, 'Line Item SKU 9', 'got description'); + is($item->total+0, 2.22, 'total is 2.22'); if ($itemclass ne 'Handel::Cart::Item') { - is($item->custom, 'custom'); + is($item->custom, 'custom', 'got custom'); }; - is($cart->count, 3); - is($cart->subtotal, 7.77); + is($cart->count, 3, 'count is 3'); + is($cart->subtotal+0, 7.77, 'subtotal is 7.77'); - my $recart = $subclass->load({ + my $reit = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 1, 'got 1 cart'); + + my $recart = $reit->first; isa_ok($recart, $subclass); - is($recart->count, 3); + is($recart->count, 3, 'has 3 items'); - my $reitem = $cart->items({sku => 'SKU9999'}); - isa_ok($item, 'Handel::Cart::Item'); - isa_ok($item, $itemclass); - is($reitem->cart, $cart->id); - is($reitem->sku, 'SKU9999'); - is($reitem->quantity, 2); - is($reitem->price, 1.11); - is($reitem->description, 'Line Item SKU 9'); - is($reitem->total, 2.22); + my $reitemit = $cart->items({sku => 'SKU9999'}); + isa_ok($reitemit, 'Handel::Iterator'); + is($reitemit, 1, 'got 1 item'); + + my $reitem = $reitemit->first; + isa_ok($reitem, 'Handel::Cart::Item'); + isa_ok($reitem, $itemclass); + is($reitem->cart, $cart->id, 'cart is set'); + is($reitem->sku, 'SKU9999', 'got sku'); + is($reitem->quantity, 2, 'quantity is 2'); + is($reitem->price+0, 1.11, 'price is 1.11'); + is($reitem->description, 'Line Item SKU 9', 'got description'); + is($reitem->total+0, 2.22, 'total is 2.22'); if ($itemclass ne 'Handel::Cart::Item') { - is($item->custom, 'custom'); + is($item->custom, 'custom', 'got custom'); }; }; @@ -140,57 +147,199 @@ sub run { sku => 'SKU8888', quantity => 1, price => 1.11, - description => 'Line Item SKU 8' + description => 'Line Item SKU 8', + cart => '00000000-0000-0000-0000-000000000000' }; if ($itemclass ne 'Handel::Cart::Item') { $data->{'custom'} = 'custom'; }; - my $newitem = $itemclass->new($data); + my $newitem = $itemclass->create($data); isa_ok($newitem, 'Handel::Cart::Item'); isa_ok($newitem, $itemclass); - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); my $item = $cart->add($newitem); isa_ok($item, 'Handel::Cart::Item'); isa_ok($item, $itemclass); - is($item->cart, $cart->id, "koo"); - is($item->sku, 'SKU8888'); - is($item->quantity, 1); - is($item->price, 1.11); - is($item->description, 'Line Item SKU 8'); - is($item->total, 1.11); + is($item->cart, $cart->id, 'cart is set'); + is($item->sku, 'SKU8888', 'got sku'); + is($item->quantity, 1, 'quantity is 1'); + is($item->price+0, 1.11, 'price is 1.11'); + is($item->description, 'Line Item SKU 8', 'got description'); + is($item->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item->custom, 'custom'); + is($item->custom, 'custom', 'got custom'); }; - is($cart->count, 2); - is($cart->subtotal, 11.10); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 11.10, 'subtotal is 11.10'); - my $recart = $subclass->load({ + my $recartit = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($recartit, 'Handel::Iterator'); + is($recartit, 1, 'got 1 cart'); + + my $recart = $recartit->first; isa_ok($recart, $subclass); isa_ok($recart, 'Handel::Cart'); - is($recart->count, 2); + is($recart->count, 2, 'has 2 items'); + + my $reitemit = $cart->items({sku => 'SKU8888'}); + isa_ok($reitemit, 'Handel::Iterator'); + is($reitemit, 1, 'have 1 cart'); - my $reitem = $cart->items({sku => 'SKU8888'}); + my $reitem = $reitemit->first; isa_ok($reitem, 'Handel::Cart::Item'); isa_ok($reitem, $itemclass); - is($reitem->cart, $cart->id); - is($reitem->sku, 'SKU8888'); - is($reitem->quantity, 1); - is($reitem->price, 1.11); - is($reitem->description, 'Line Item SKU 8'); - is($reitem->total, 1.11); + is($reitem->cart, $cart->id, 'cart is set'); + is($reitem->sku, 'SKU8888', 'sku is set'); + is($reitem->quantity, 1, 'quantity is 1'); + is($reitem->price+0, 1.11, 'price is 1.11'); + is($reitem->description, 'Line Item SKU 8', 'got description'); + is($reitem->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item->custom, 'custom'); + is($item->custom, 'custom', 'got custom'); }; }; +}; + + +## add a new item by passing a Handel::Cart::Item where object has no column +## accessor methods, but the result does +{ + local *Handel::Cart::Item::can = sub {}; + + my $data = { + sku => 'SKU8888', + quantity => 1, + price => 1.11, + description => 'Line Item SKU 8', + cart => '00000000-0000-0000-0000-000000000001' + }; + + my $newitem = Handel::Cart::Item->create($data); + isa_ok($newitem, 'Handel::Cart::Item'); + + my $it = Handel::Cart->search({ + id => '22222222-2222-2222-2222-222222222222' + }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; + isa_ok($cart, 'Handel::Cart'); + + + my $item = $cart->add($newitem); + isa_ok($item, 'Handel::Cart::Item'); + is($item->cart, $cart->id, 'cart is set'); + is($item->sku, 'SKU8888', 'got sku'); + is($item->quantity, 1, 'quantity is 1'); + is($item->price+0, 1.11, 'price is 1.11'); + is($item->description, 'Line Item SKU 8', 'got description'); + is($item->total+0, 1.11, 'total is 1.11'); + + is($cart->count, 3, 'has 3 items'); + is($cart->subtotal+0, 12.21, 'subtotal is 12.21'); + + my $recartit = Handel::Cart->search({ + id => '22222222-2222-2222-2222-222222222222' + }); + isa_ok($recartit, 'Handel::Iterator'); + is($recartit, 1, 'got 1 cart'); + + my $recart = $recartit->first; + isa_ok($recart, 'Handel::Cart'); + is($recart->count, 3, 'has 3 items'); + + my $reitemit = $cart->items({sku => 'SKU8888'}); + isa_ok($reitemit, 'Handel::Iterator'); + is($reitemit, 2, 'has 2 items'); + + my $reitem = $reitemit->first; + isa_ok($reitem, 'Handel::Cart::Item'); + is($reitem->cart, $cart->id, 'cart is set'); + is($reitem->sku, 'SKU8888', 'got sku'); + is($reitem->quantity, 1, 'quantity is 1'); + is($reitem->price+0, 1.11, 'price is 1.11'); + is($reitem->description, 'Line Item SKU 8', 'got description'); + is($reitem->total+0, 1.11, 'total is 1.11'); +}; + + +## add a new item by passing a Handel::Cart::Item where object has no column +## accessor methods and no result accessor methods +{ + no warnings 'once'; + no warnings 'redefine'; + + local *Handel::Cart::Item::can = sub {}; + local *Handel::Storage::DBIC::Result::can = sub {return 1 if $_[1] eq 'sku'}; + + my $data = { + sku => 'SKU8888', + quantity => 1, + price => 1.11, + description => 'Line Item SKU 8', + cart => '00000000-0000-0000-0000-000000000002' + }; + my $newitem = Handel::Cart::Item->create($data); + isa_ok($newitem, 'Handel::Cart::Item'); + + my $it = Handel::Cart->search({ + id => '22222222-2222-2222-2222-222222222222' + }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; + isa_ok($cart, 'Handel::Cart'); + + + my $item = $cart->add($newitem); + isa_ok($item, 'Handel::Cart::Item'); + is($item->cart, $cart->id, 'cart is set'); + is($item->sku, 'SKU8888', 'got sku'); + is($item->quantity, 1, 'quantity is 1'); + is($item->price+0, 0, 'price is 0'); + is($item->description, undef, 'no description'); + is($item->total+0, 0, 'total is 0'); + + is($cart->count, 4, 'has 4 items'); + is($cart->subtotal+0, 12.21, 'subtotal 12.21'); + + my $recartit = Handel::Cart->search({ + id => '22222222-2222-2222-2222-222222222222' + }); + isa_ok($recartit, 'Handel::Iterator'); + is($recartit, 1, 'got 1 cart'); + + my $recart = $recartit->first; + isa_ok($recart, 'Handel::Cart'); + is($recart->count, 4, 'has 4 items'); + + my $reitemit = $cart->items(); + isa_ok($reitemit, 'Handel::Iterator'); + is($reitemit, 4, 'has 4 items'); + + my $reitem = $reitemit->last; + isa_ok($reitem, 'Handel::Cart::Item'); + is($reitem->cart, $cart->id, 'cart is set'); + is($reitem->sku, 'SKU8888', 'got sku'); + is($reitem->quantity, 1, 'quantity is 1'); + is($reitem->price+0, 0, 'price is 0'); + is($reitem->description, undef, 'no description'); + is($reitem->total+0, 0, 'total is 0'); }; t/cart_add.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 23; + plan tests => 41; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,41 +32,43 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_clear_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## Clear cart contents and validate counts { - my $cart = $subclass->load({ + my $total_items = $subclass->storage->schema_instance->resultset('Items')->count; + ok($total_items, 'has items'); + + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - ok($cart->count >= 1); + my $related_items = $cart->count; + ok($related_items >= 1, 'has more than 1 item'); $cart->clear; - is($cart->count, 0); + is($cart->count, 0, 'items cleared'); - my $recart = $subclass->load({ + my $reit = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 1, 'got 1 cart'); + + my $recart = $reit->first; isa_ok($recart, $subclass); - is($recart->count, 0); + is($recart->count, 0, 'have no items'); + + my $remaining_items = $subclass->storage->schema_instance->resultset('Items')->count; + is($remaining_items, $total_items - $related_items, 'deleted appropriate items'); }; }; t/cart_clear.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 74; + plan tests => 110; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,82 +32,100 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_delete_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; - + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## test for Handel::Exception::Argument where first param is not a hashref { try { + local $ENV{'LANG'} = 'en'; $subclass->delete(id => '1234'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a hash/i, 'not a hash in message'); } otherwise { - fail; + fail('caught other exception'); }; }; + my $total_items = $subclass->storage->schema_instance->resultset('Items')->count; + ok($total_items, 'has items in table'); + + ## Delete a single cart item contents and validate counts { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->count, 1); - is($cart->subtotal, 9.99); - is($cart->delete({sku => 'SKU3333'}), 1); - is($cart->count, 0); - is($cart->subtotal, 0); + my $related_items = $cart->count; + is($related_items, 1, 'has 1 item'); + is($cart->subtotal+0, 9.99, 'subtotal is 9.99'); + is($cart->delete({sku => 'SKU3333'}), 1, 'deleted sku3333'); + is($cart->count, 0, 'has 0 items'); + is($cart->subtotal+0, 0, 'subtotal is 0'); - my $recart = $subclass->load({ + my $reit = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 1, 'loaded 1 cart'); + + my $recart = $reit->first; isa_ok($recart, 'Handel::Cart'); isa_ok($recart, $subclass); - is($recart->count, 0); - is($recart->subtotal, 0.00); + is($recart->count, 0, 'has 0 items'); + is($recart->subtotal+0, 0.00, 'subtotal is 0'); + + my $remaining_items = $subclass->storage->schema_instance->resultset('Items')->count; + is($remaining_items, $total_items - $related_items, 'other items still in table'); + + $total_items -= $related_items; }; - ## Delete multiple cart item contents with wildcard filter and validate counts + ## Delete multiple cart item contents with wildcard filter and validate + ## counts using the old style wildcards { - my $cart = $subclass->load({ - id => '11111111-1111-1111-1111-111111111111' + my $it = $subclass->search({ + id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->count, 2); - is($cart->subtotal, 5.55); - ok($cart->delete({sku => 'SKU%'})); - is($cart->count, 0); - is($cart->subtotal, 0); + my $related_items = $cart->count; + is($related_items, 2, 'has 2 items'); + is($cart->subtotal+0, 45.51, 'subtotal is 45.51'); + ok($cart->delete({sku => 'SKU%'}), 'deleted SKU%'); + is($cart->count, 0, 'has 0 items'); + is($cart->subtotal+0, 0, 'subtotal is 0'); - my $recart = $subclass->load({ - id => '11111111-1111-1111-1111-111111111111' + my $reit = $subclass->search({ + id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 1, 'loaded 1 cart'); + + my $recart = $reit->first; isa_ok($recart, 'Handel::Cart'); isa_ok($recart, $subclass); - is($recart->count, 0); - is($recart->subtotal, 0.00); - }; + is($recart->count, 0, 'has 0 items'); + is($recart->subtotal+0, 0.00, 'subtotal is 0'); + my $remaining_items = $subclass->storage->schema_instance->resultset('Items')->count; + is($remaining_items, $total_items - $related_items, 'table still has unrelated items'); + }; }; t/cart_delete.t @@ -2,27 +2,30 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 35; + plan tests => 87; }; use_ok('Handel::Cart'); use_ok('Handel::Subclassing::Cart'); use_ok('Handel::Subclassing::CartOnly'); - use_ok('Handel::Constants', qw(:cart :returnas)); + use_ok('Handel::Constants', qw(:cart)); use_ok('Handel::Exception', ':try'); }; ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); +my $altschema = Handel::Test->init_schema(db_file => 'althandel.db', namespace => 'Handel::AltSchema'); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,70 +33,140 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_destroy_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## Test for Handel::Exception::Argument where first param is not a hashref { try { + local $ENV{'LANG'} = 'en'; $subclass->destroy(id => '1234'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a hash/i, 'not a hash in message'); } otherwise { - fail; + fail('caught other exception'); }; }; + my $total_carts = $subclass->storage->schema_instance->resultset('Carts')->count; + ok($total_carts, 'table has carts'); + + my $total_items = $subclass->storage->schema_instance->resultset('Items')->count; + ok($total_items, 'table has items'); + + ## Destroy a single cart via instance { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->count, 1); - is($cart->subtotal, 9.99); + + my $related_items = $cart->count; + is($related_items, 1, 'has 1 item'); + is($cart->subtotal+0, 9.99, 'subtotal is 9.99'); $cart->destroy; - my $recart = $subclass->load({ + my $reit = $subclass->search({ id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 0, 'has no cart'); + + my $recart = $reit->first; + is($recart, undef, 'has no cart'); + + my $remaining_carts = $subclass->storage->schema_instance->resultset('Carts')->count; + my $remaining_items = $subclass->storage->schema_instance->resultset('Items')->count; - is($recart, 0); + is($remaining_carts, $total_carts - 1, 'unrelated carts in table'); + is($remaining_items, $total_items - $related_items, 'unrelated items in table'); + + $total_carts--; + $total_items -= $related_items; }; ## Destroy multiple carts with wildcard filter { - my $carts = $subclass->load({name => 'Cart%'}, RETURNAS_ITERATOR); + my $carts = $subclass->search({description => {like => 'Saved%'}}); isa_ok($carts, 'Handel::Iterator'); - is($carts, 2); + is($carts, 1, 'loaded 1 cart'); + + my $related_items = $carts->first->items->count; + ok($related_items, 'has items'); $subclass->destroy({ - name => 'Cart%' + description => {like => 'Saved%'} + }); + + $carts = $subclass->search({description => {like => 'Saved%'}}); + isa_ok($carts, 'Handel::Iterator'); + is($carts, 0, 'cart not loaded'); + + my $remaining_carts = $subclass->storage->schema_instance->resultset('Carts')->count; + my $remaining_items = $subclass->storage->schema_instance->resultset('Items')->count; + + is($remaining_carts, $total_carts - 1, 'table has unrelated carts'); + is($remaining_items, $total_items - $related_items, 'table has unrelated items'); + }; + + + ## Destroy carts on an instance + { + my $instance = bless {}, $subclass; + my $carts = $subclass->search; + isa_ok($carts, 'Handel::Iterator'); + is($carts, 1, 'loaded 1 cart'); + + $instance->destroy({ + description => {like => '%'} }); - $carts = $subclass->load({name => 'Cart%'}, RETURNAS_ITERATOR); + $carts = $subclass->search; isa_ok($carts, 'Handel::Iterator'); - is($carts, 0); + is($carts, 0, 'no carts loaded'); }; +}; + + + +## pass in storage instead +{ + my $storage = Handel::Cart->storage_class->new; + local $ENV{'HandelDBIDSN'} = $altschema->dsn; + + is($altschema->resultset('Carts')->search({id => '11111111-1111-1111-1111-111111111111'})->count, 1, 'cart found in alt storage'); + Handel::Cart->destroy({ + id => '11111111-1111-1111-1111-111111111111' + }, { + storage => $storage + }); + is($altschema->resultset('Carts')->search({id => '11111111-1111-1111-1111-111111111111'})->count, 0, 'cart removed from alt storage'); +}; + + +## don't unset self if no result is returned +{ + my $storage = Handel::Cart->storage_class->new; + local $ENV{'HandelDBIDSN'} = $altschema->dsn; + + my $cart = Handel::Cart->search({id => '22222222-2222-2222-2222-222222222222'}, {storage => $storage})->first; + ok($cart, 'cart still defined if nothing deleted'); + no warnings 'redefine'; + local *Handel::Storage::DBIC::Result::delete = sub {}; + $cart->destroy; + ok($cart, 'cart still defined if delete returns nothing'); }; t/cart_destroy.t @@ -2,27 +2,29 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 378; + plan tests => 491; }; use_ok('Handel::Cart'); use_ok('Handel::Subclassing::Cart'); use_ok('Handel::Subclassing::CartOnly'); - use_ok('Handel::Constants', qw(:cart :returnas)); + use_ok('Handel::Constants', qw(:cart)); use_ok('Handel::Exception', ':try'); }; ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,84 +32,78 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_items_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; - ## load multiple item Handel::Cart object and get items array on RETURNAS_AUTO + ## load multiple item Handel::Cart object and get items array { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; my @items = $cart->items; - is(scalar @items, $cart->count); + is(scalar @items, $cart->count, 'loaded all items'); my $item1 = $items[0]; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items[1]; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; ## While we are here, lets poop out a max quantity exception - ## THere should be a better place for this, but I haven't found it yet. :-) + ## There should be a better place for this, but I haven't found it yet. :-) { local $ENV{'HandelMaxQuantity'} = 5; local $ENV{'HandelMaxQuantityAction'} = 'Exception'; try { $item2->quantity(6); + + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/failed database constraint/i, 'failed constraint in message'); } otherwise { - fail; + fail('caught other exception'); }; }; @@ -118,186 +114,283 @@ sub run { local $ENV{'HandelMaxQuantity'} = 2; $item2->quantity(6); - is($item2->quantity, 2); + is($item2->quantity, 2, 'quantity is 2'); }; + + + ## throw exception when filter isn't a hashref + { + try { + local $ENV{'LANG'} = 'en'; + $cart->items(['foo']); + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/not a hash/i, 'not a hash ref in message'); + } otherwise { + fail('Other exception thrown'); + }; + }; + + + ## throw exception when options isn't a hashref + { + try { + local $ENV{'LANG'} = 'en'; + $cart->items({}, []); + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/not a hash/i, 'not a hash ref in message'); + } otherwise { + fail('Other exception thrown'); + }; + }; + + + ## test out order_by + my @oitems = $cart->items(undef, {order_by => 'id DESC'}); + is(scalar @oitems, 2, 'has 2 ordered items'); + is($oitems[0]->id, '22222222-2222-2222-2222-222222222222', 'first item is last'); + is($oitems[1]->id, '11111111-1111-1111-1111-111111111111', 'last item is first'); }; - ## load multiple item Handel::Cart object and get items array on RETURNAS_LIST + ## load multiple item Handel::Cart object and get items array { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'total is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my @items = $cart->items(undef, RETURNAS_LIST); - is(scalar @items, $cart->count); + my @items = $cart->items(); + is(scalar @items, $cart->count, 'loaded same items'); my $item1 = $items[0]; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items[1]; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; }; ## load multiple item Handel::Cart object and get items Iterator { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'has 2 items'); }; ## load multiple item Handel::Cart object and get filter single item { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $item2 = $cart->items({sku => 'SKU2222'}); + my $itemit = $cart->items({sku => 'SKU2222'}); + isa_ok($itemit, 'Handel::Iterator'); + is($itemit, 1, 'has 1 item'); + + my $item2 = $itemit->first; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; }; ## load multiple item Handel::Cart object and get filter single item to Iterator { - my $cart = $subclass->load({ + my $it = $subclass->search({ + id => '11111111-1111-1111-1111-111111111111' + }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; + isa_ok($cart, 'Handel::Cart'); + isa_ok($cart, $subclass); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); + if ($subclass ne 'Handel::Cart') { + is($cart->custom, 'custom', 'got custom field'); + }; + + my $iterator = $cart->items({sku => 'SKU2222'}); + isa_ok($iterator, 'Handel::Iterator'); + }; + + + ## load multiple item Handel::Cart object and get wildcard filter to Iterator + ## using SQL::Abstract wildcard syntax + { + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $iterator = $cart->items({sku => 'SKU2222'}, 1); + my $iterator = $cart->items({sku => {like=>'SKU%'}}); isa_ok($iterator, 'Handel::Iterator'); + is($iterator, 2, 'has 2 items'); }; ## load multiple item Handel::Cart object and get wildcard filter to Iterator + ## using old style wildcard syntax { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 2.22'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $iterator = $cart->items({sku => 'SKU%'}, 1); + my $iterator = $cart->items({sku => 'SKU%'}); isa_ok($iterator, 'Handel::Iterator'); - is($iterator, 2); + is($iterator, 2, 'has 2 items'); }; ## load multiple item Handel::Cart object and get filter bogus item to Iterator { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $iterator = $cart->items({sku => 'notfound'}, 1); + my $iterator = $cart->items({sku => 'notfound'}); isa_ok($iterator, 'Handel::Iterator'); }; t/cart_items.t @@ -2,11 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,158 +32,144 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_iterator_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; - + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## load all carts and iterator all cart and all items { - my $carts = $subclass->load(undef, 1); + my $carts = $subclass->search; isa_ok($carts, 'Handel::Iterator'); - is($carts->count, 3); + is($carts->count, 3, 'loaded 3 '); my $cart1 = $carts->next; isa_ok($cart1, 'Handel::Cart'); isa_ok($cart1, $subclass); - is($cart1->id, '11111111-1111-1111-1111-111111111111'); - is($cart1->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart1->type, CART_TYPE_TEMP); - is($cart1->name, 'Cart 1'); - is($cart1->description, 'Test Temp Cart 1'); - is($cart1->count, 2); - is($cart1->subtotal, 5.55); + is($cart1->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart1->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart1->type, CART_TYPE_TEMP, 'got temp type'); + is($cart1->name, 'Cart 1', 'got name'); + is($cart1->description, 'Test Temp Cart 1', 'got description'); + is($cart1->count, 2, 'has 2 items'); + is($cart1->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart1->custom, 'custom'); + is($cart1->custom, 'custom', 'got custom field'); }; - my $items = $cart1->items(undef, 1); + my $items = $cart1->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'has 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart1->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart1->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart1->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart1->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; my $item3 = $items->next; - is($item3, undef); + is($item3, undef, 'no more items'); my $cart2 = $carts->next; isa_ok($cart2, 'Handel::Cart'); isa_ok($cart2, $subclass); - is($cart2->id, '22222222-2222-2222-2222-222222222222'); - is($cart2->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart2->type, CART_TYPE_TEMP); - is($cart2->name, 'Cart 2'); - is($cart2->description, 'Test Temp Cart 2'); - is($cart2->count, 1); - is($cart2->subtotal, 9.99); + is($cart2->id, '22222222-2222-2222-2222-222222222222', 'got cart id'); + is($cart2->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart2->type, CART_TYPE_TEMP, 'got temp type'); + is($cart2->name, 'Cart 2', 'got name'); + is($cart2->description, 'Test Temp Cart 2', 'got description'); + is($cart2->count, 1, 'has 1 item'); + is($cart2->subtotal+0, 9.99, 'subtotal is 9.99'); if ($subclass ne 'Handel::Cart') { - is($cart2->custom, 'custom'); + is($cart2->custom, 'custom', 'got custom field'); }; - my $items2 = $cart2->items(undef, 1); + my $items2 = $cart2->items; isa_ok($items2, 'Handel::Iterator'); - is($items2->count, 1); + is($items2->count, 1, 'has 1 item'); my $item4 = $items2->next; isa_ok($item4, 'Handel::Cart::Item'); isa_ok($item4, $itemclass); - is($item4->id, '33333333-3333-3333-3333-333333333333'); - is($item4->cart, $cart2->id); - is($item4->sku, 'SKU3333'); - is($item4->quantity, 3); - is($item4->price, 3.33); - is($item4->description, 'Line Item SKU 3'); - is($item4->total, 9.99); + is($item4->id, '33333333-3333-3333-3333-333333333333', 'got item id'); + is($item4->cart, $cart2->id, 'cart id is set'); + is($item4->sku, 'SKU3333', 'got sku'); + is($item4->quantity, 3, 'quantity is 3'); + is($item4->price+0, 3.33, 'price is 3.33'); + is($item4->description, 'Line Item SKU 3', 'got description'); + is($item4->total+0, 9.99, 'total is 9.99'); if ($itemclass ne 'Handel::Cart::Item') { - is($item4->custom, 'custom'); + is($item4->custom, 'custom', 'got custom field'); }; my $cart3 = $carts->next; isa_ok($cart3, 'Handel::Cart'); isa_ok($cart3, $subclass); - is($cart3->id, '33333333-3333-3333-3333-333333333333'); - is($cart3->shopper, '33333333-3333-3333-3333-333333333333'); - is($cart3->type, CART_TYPE_SAVED); - is($cart3->name, 'Cart 3'); - is($cart3->description, 'Saved Cart 1'); - is($cart3->count, 2); - is($cart3->subtotal, 45.51); + is($cart3->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($cart3->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($cart3->type, CART_TYPE_SAVED, 'got saved type'); + is($cart3->name, 'Cart 3', 'got name'); + is($cart3->description, 'Saved Cart 1', 'got description'); + is($cart3->count, 2, 'has 2 items'); + is($cart3->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($cart3->custom, 'custom'); + is($cart3->custom, 'custom', 'got custom field'); }; - my $items3 = $cart3->items(undef, 1); + my $items3 = $cart3->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 2); + is($items3->count, 2, 'has 2 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - is($item5->id, '44444444-4444-4444-4444-444444444444'); - is($item5->cart, $cart3->id); - is($item5->sku, 'SKU4444'); - is($item5->quantity, 4); - is($item5->price, 4.44); - is($item5->description, 'Line Item SKU 4'); - is($item5->total, 17.76); + is($item5->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item5->cart, $cart3->id, 'cart id is set'); + is($item5->sku, 'SKU4444', 'got sku'); + is($item5->quantity, 4, 'quantity is 4'); + is($item5->price+0, 4.44, 'prive is 4.44'); + is($item5->description, 'Line Item SKU 4', 'got description'); + is($item5->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - is($item6->id, '55555555-5555-5555-5555-555555555555'); - is($item6->cart, $cart3->id); - is($item6->sku, 'SKU1111'); - is($item6->quantity, 5); - is($item6->price, 5.55); - is($item6->description, 'Line Item SKU 5'); - is($item6->total, 27.75); + is($item6->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item6->cart, $cart3->id, 'cart id is set'); + is($item6->sku, 'SKU1111', 'got sku'); + is($item6->quantity, 5, 'quantity is 5'); + is($item6->price+0, 5.55, 'price is 5.55'); + is($item6->description, 'Line Item SKU 5', 'got sku'); + is($item6->total+0, 27.75, 'titak us 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; my $cart4 = $carts->next; - is($cart4, undef); + is($cart4, undef, 'no carts left'); }; }; t/cart_iterator.t @@ -2,16 +2,10 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; BEGIN { - eval 'require DBD::SQLite'; - if($@) { - plan skip_all => 'DBD::SQLite not installed'; - } else { - plan tests => 10; - }; + use lib 't/lib'; + use Handel::Test tests => 16; use_ok('Handel::Cart'); use_ok('Handel::Subclassing::Cart'); @@ -33,13 +27,15 @@ sub run { ## or Handle::Cart subclass { try { + local $ENV{'LANG'} = 'en'; $subclass->restore(id => '1234'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/not a hash/i, 'no a hash ref in message'); } otherwise { - fail; + fail('Other exception thrown'); }; }; @@ -48,15 +44,16 @@ sub run { ## or Handle::Cart::Item subclass { try { + local $ENV{'LANG'} = 'en'; my $fakeitem = bless {}, 'FakeItem'; $subclass->restore($fakeitem); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/not a hash/i, 'no a hash ref in message'); } otherwise { - fail; + fail('Other exception thrown'); }; }; - }; t/cart_restore.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 413; + plan tests => 437; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,20 +32,27 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; - ## Setup SQLite DB for tests + + ## test for Handel::Exception::Argument where with unknown restore mode { - my $dbfile = "t/cart_restore_append_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; + my $cart = $subclass->search({ + id => '11111111-1111-1111-1111-111111111111' + })->first; - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); + try { + local $ENV{'LANG'} = 'en'; + $cart->restore({id => '1234'}, 42); - local $^W = 0; - Handel::DBI->connection($db); + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/unknown restore mode/i, 'unknown restore more in message'); + } otherwise { + fail('Other exception thrown'); + }; }; @@ -51,223 +60,235 @@ sub run { ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # load the saved cart - my $saved = $subclass->load({ + my $sit = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit, 'Handel::Iterator'); + is($sit, 1, 'loaded 1 cart'); + + my $saved = $sit->first; isa_ok($saved, 'Handel::Cart'); isa_ok($saved, $subclass); - is($saved->id, '33333333-3333-3333-3333-333333333333'); - is($saved->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved->type, CART_TYPE_SAVED); - is($saved->name, 'Cart 3'); - is($saved->description, 'Saved Cart 1'); - is($saved->count, 2); - is($saved->subtotal, 45.51); + is($saved->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved->type, CART_TYPE_SAVED, 'got temp type'); + is($saved->name, 'Cart 3', 'got name'); + is($saved->description, 'Saved Cart 1', 'got description'); + is($saved->count, 2, 'has 2 items'); + is($saved->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved->custom, 'custom'); + is($saved->custom, 'custom', 'got custom field'); }; - my $items2 = $saved->items(undef, 1); + my $items2 = $saved->items(); isa_ok($items2, 'Handel::Iterator'); - is($items2->count, 2); + is($items2->count, 2, 'loaded 2 items'); my $item3 = $items2->next; isa_ok($item3, 'Handel::Cart::Item'); isa_ok($item3, $itemclass); - is($item3->id, '44444444-4444-4444-4444-444444444444'); - is($item3->cart, $saved->id); - is($item3->sku, 'SKU4444'); - is($item3->quantity, 4); - is($item3->price, 4.44); - is($item3->description, 'Line Item SKU 4'); - is($item3->total, 17.76); + is($item3->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item3->cart, $saved->id, 'cart id is set'); + is($item3->sku, 'SKU4444', 'got sku'); + is($item3->quantity, 4, 'quantity is 4'); + is($item3->price+0, 4.44, 'price is 4.44'); + is($item3->description, 'Line Item SKU 4', 'got description'); + is($item3->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item3->custom, 'custom'); + is($item3->custom, 'custom', 'got custom field'); }; my $item4 = $items2->next; isa_ok($item4, 'Handel::Cart::Item'); isa_ok($item4, $itemclass); - is($item4->id, '55555555-5555-5555-5555-555555555555'); - is($item4->cart, $saved->id); - is($item4->sku, 'SKU1111'); - is($item4->quantity, 5); - is($item4->price, 5.55); - is($item4->description, 'Line Item SKU 5'); - is($item4->total, 27.75); + is($item4->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item4->cart, $saved->id, 'cart id is set'); + is($item4->sku, 'SKU1111', 'got sku'); + is($item4->quantity, 5, 'quantity is 5'); + is($item4->price+0, 5.55, 'price is 5.55'); + is($item4->description, 'Line Item SKU 5', 'got description'); + is($item4->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item4->custom, 'custom'); + is($item4->custom, 'custom', 'got custom field'); }; # restore the saved cart replacing the temp cart and verify the results $cart->restore($saved, CART_MODE_APPEND); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 4); - is($cart->subtotal, 51.06); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 4, 'has 4 items'); + is($cart->subtotal+0, 51.06, 'subtotal is 51.06'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 4); + is($items3->count, 4, 'loaded 4 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - is($item5->id, '11111111-1111-1111-1111-111111111111'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU1111'); - is($item5->quantity, 1); - is($item5->price, 1.11); - is($item5->description, 'Line Item SKU 1'); - is($item5->total, 1.11); + is($item5->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item5->cart, $cart->id, 'cart id is set'); + is($item5->sku, 'SKU1111', 'got sku'); + is($item5->quantity, 1, 'quantity is 1'); + is($item5->price+0, 1.11, 'price is 1.11'); + is($item5->description, 'Line Item SKU 1', 'got description'); + is($item5->total+0, 1.11, 'price is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - is($item6->id, '22222222-2222-2222-2222-222222222222'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU2222'); - is($item6->quantity, 2); - is($item6->price, 2.22); - is($item6->description, 'Line Item SKU 2'); - is($item6->total, 4.44); + is($item6->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU2222', 'got sku'); + is($item6->quantity, 2, 'quantity is 2'); + is($item6->price+0, 2.22, 'price is 2.22'); + is($item6->description, 'Line Item SKU 2', 'got description'); + is($item6->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; my $item7 = $items3->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - isnt($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $cart->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + isnt($item7->id, '44444444-4444-4444-4444-444444444444', 'got different id'); + is($item7->cart, $cart->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; my $item8 = $items3->next; isa_ok($item8, 'Handel::Cart::Item'); isa_ok($item8, $itemclass); - isnt($item8->id, '55555555-5555-5555-5555-555555555555'); - is($item8->cart, $cart->id); - is($item8->sku, 'SKU1111'); - is($item8->quantity, 5); - is($item8->price, 5.55); - is($item8->description, 'Line Item SKU 5'); - is($item8->total, 27.75); + isnt($item8->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item8->cart, $cart->id, 'cart id is set'); + is($item8->sku, 'SKU1111', 'got sku'); + is($item8->quantity, 5, 'quantity is 5'); + is($item8->price+0, 5.55, 'price is 5.55'); + is($item8->description, 'Line Item SKU 5', 'got description'); + is($item8->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item8->custom, 'custom'); + is($item8->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $saved2it = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($saved2it, 'Handel::Iterator'); + is($saved2it, 1, 'loaded 1 cart'); + + my $saved2 = $saved2it->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 2 items'); my $item9 = $items4->next; isa_ok($item9, 'Handel::Cart::Item'); isa_ok($item9, $itemclass); - is($item9->id, '44444444-4444-4444-4444-444444444444'); - is($item9->cart, $saved2->id); - is($item9->sku, 'SKU4444'); - is($item9->quantity, 4); - is($item9->price, 4.44); - is($item9->description, 'Line Item SKU 4'); - is($item9->total, 17.76); + is($item9->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item9->cart, $saved2->id, 'cart id is set'); + is($item9->sku, 'SKU4444', 'got sku'); + is($item9->quantity, 4, 'quantity is 4'); + is($item9->price+0, 4.44, 'price is 4.44'); + is($item9->description, 'Line Item SKU 4', 'got description'); + is($item9->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item9->custom, 'custom'); + is($item9->custom, 'custom', 'got custom field'); }; my $item10 = $items4->next; isa_ok($item10, 'Handel::Cart::Item'); isa_ok($item10, $itemclass); - is($item10->id, '55555555-5555-5555-5555-555555555555'); - is($item10->cart, $saved2->id); - is($item10->sku, 'SKU1111'); - is($item10->quantity, 5); - is($item10->price, 5.55); - is($item10->description, 'Line Item SKU 5'); - is($item10->total, 27.75); + is($item10->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item10->cart, $saved2->id, 'cart id is set'); + is($item10->sku, 'SKU1111', 'got sku'); + is($item10->quantity, 5, 'quantity is 5'); + is($item10->price+0, 5.55, 'price is 5.55'); + is($item10->description, 'Line Item SKU 5', 'got description'); + is($item10->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item10->custom, 'custom'); + is($item10->custom, 'custom', 'got custom field'); }; }; t/cart_restore_append.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 320; + plan tests => 332; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,193 +32,188 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_restore_append_filter_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## restore saved cart appending items to current cart ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantiy is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # restore the saved cart replacing the temp cart and verify the results $cart->restore({id => '33333333-3333-3333-3333-333333333333'}, CART_MODE_APPEND); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 4); - is($cart->subtotal, 51.06); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 4, 'has 4 items'); + is($cart->subtotal+0, 51.06, 'subtotal is 51.06'); - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 4); + is($items3->count, 4, 'loaded 4 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - is($item5->id, '11111111-1111-1111-1111-111111111111'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU1111'); - is($item5->quantity, 1); - is($item5->price, 1.11); - is($item5->description, 'Line Item SKU 1'); - is($item5->total, 1.11); + is($item5->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item5->cart, $cart->id, 'cart id is set'); + is($item5->sku, 'SKU1111', 'got sku'); + is($item5->quantity, 1, 'quantity is 1'); + is($item5->price+0, 1.11, 'price is 1.11'); + is($item5->description, 'Line Item SKU 1', 'got description'); + is($item5->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - is($item6->id, '22222222-2222-2222-2222-222222222222'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU2222'); - is($item6->quantity, 2); - is($item6->price, 2.22); - is($item6->description, 'Line Item SKU 2'); - is($item6->total, 4.44); + is($item6->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU2222', 'got sku'); + is($item6->quantity, 2, 'quantity is 2'); + is($item6->price+0, 2.22, 'price is 2.22'); + is($item6->description, 'Line Item SKU 2', 'got description'); + is($item6->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; my $item7 = $items3->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - isnt($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $cart->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + isnt($item7->id, '44444444-4444-4444-4444-444444444444', 'id is different'); + is($item7->cart, $cart->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; my $item8 = $items3->next; isa_ok($item8, 'Handel::Cart::Item'); isa_ok($item8, $itemclass); - isnt($item8->id, '55555555-5555-5555-5555-555555555555'); - is($item8->cart, $cart->id); - is($item8->sku, 'SKU1111'); - is($item8->quantity, 5); - is($item8->price, 5.55); - is($item8->description, 'Line Item SKU 5'); - is($item8->total, 27.75); + isnt($item8->id, '55555555-5555-5555-5555-555555555555', 'id is different'); + is($item8->cart, $cart->id, 'cart id is set'); + is($item8->sku, 'SKU1111', 'got sku'); + is($item8->quantity, 5, 'quantity is 5'); + is($item8->price+0, 5.55, 'price is 5.55'); + is($item8->description, 'Line Item SKU 5', 'got description'); + is($item8->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $sit2 = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit2, 'Handel::Iterator'); + is($sit2, 1, 'loaded 1 cart'); + + my $saved2 = $sit2->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 2 items'); my $item9 = $items4->next; isa_ok($item9, 'Handel::Cart::Item'); isa_ok($item9, $itemclass); - is($item9->id, '44444444-4444-4444-4444-444444444444'); - is($item9->cart, $saved2->id); - is($item9->sku, 'SKU4444'); - is($item9->quantity, 4); - is($item9->price, 4.44); - is($item9->description, 'Line Item SKU 4'); - is($item9->total, 17.76); + is($item9->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item9->cart, $saved2->id, 'cart id is set'); + is($item9->sku, 'SKU4444', 'got sku'); + is($item9->quantity, 4, 'quantity is 4'); + is($item9->price+0, 4.44, 'price is 4.44'); + is($item9->description, 'Line Item SKU 4', 'got description'); + is($item9->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item9->custom, 'custom'); + is($item9->custom, 'custom', 'got custom field'); }; my $item10 = $items4->next; isa_ok($item10, 'Handel::Cart::Item'); isa_ok($item10, $itemclass); - is($item10->id, '55555555-5555-5555-5555-555555555555'); - is($item10->cart, $saved2->id); - is($item10->sku, 'SKU1111'); - is($item10->quantity, 5); - is($item10->price, 5.55); - is($item10->description, 'Line Item SKU 5'); - is($item10->total, 27.75); + is($item10->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item10->cart, $saved2->id, 'cart id is set'); + is($item10->sku, 'SKU1111', 'got sku'); + is($item10->quantity, 5, 'quantity is 5'); + is($item10->price+0, 5.55, 'price is 5.55'); + is($item10->description, 'Line Item SKU 5', 'got description'); + is($item10->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item10->custom, 'custom'); + is($item10->custom, 'custom', 'got custom field'); }; }; t/cart_restore_append_filter.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 385; + plan tests => 403; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,228 +32,227 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_restore_merge_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## restore saved cart appending items to current cart ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # load the saved cart - my $saved = $subclass->load({ + my $sit = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit, 'Handel::Iterator'); + is($sit, 1, 'loaded 1 cart'); + + my $saved = $sit->first; isa_ok($saved, 'Handel::Cart'); isa_ok($saved, $subclass); - is($saved->id, '33333333-3333-3333-3333-333333333333'); - is($saved->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved->type, CART_TYPE_SAVED); - is($saved->name, 'Cart 3'); - is($saved->description, 'Saved Cart 1'); - is($saved->count, 2); - is($saved->subtotal, 45.51); + is($saved->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved->type, CART_TYPE_SAVED, 'got saved type'); + is($saved->name, 'Cart 3', 'got name'); + is($saved->description, 'Saved Cart 1', 'got description'); + is($saved->count, 2, 'has 2 items'); + is($saved->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved->custom, 'custom'); + is($saved->custom, 'custom', 'got custom field'); }; - my $items2 = $saved->items(undef, 1); + my $items2 = $saved->items; isa_ok($items2, 'Handel::Iterator'); - is($items2->count, 2); + is($items2->count, 2, 'loaded 2 items'); my $item3 = $items2->next; isa_ok($item3, 'Handel::Cart::Item'); isa_ok($item3, $itemclass); - is($item3->id, '44444444-4444-4444-4444-444444444444'); - is($item3->cart, $saved->id); - is($item3->sku, 'SKU4444'); - is($item3->quantity, 4); - is($item3->price, 4.44); - is($item3->description, 'Line Item SKU 4'); - is($item3->total, 17.76); + is($item3->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item3->cart, $saved->id, 'cart id is set'); + is($item3->sku, 'SKU4444', 'got sku'); + is($item3->quantity, 4, 'quantity is 4'); + is($item3->price+0, 4.44, 'price is 4.44'); + is($item3->description, 'Line Item SKU 4', 'got description'); + is($item3->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item3->custom, 'custom'); + is($item3->custom, 'custom', 'got custom field'); }; my $item4 = $items2->next; isa_ok($item4, 'Handel::Cart::Item'); isa_ok($item4, $itemclass); - is($item4->id, '55555555-5555-5555-5555-555555555555'); - is($item4->cart, $saved->id); - is($item4->sku, 'SKU1111'); - is($item4->quantity, 5); - is($item4->price, 5.55); - is($item4->description, 'Line Item SKU 5'); - is($item4->total, 27.75); + is($item4->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item4->cart, $saved->id, 'cart id is set'); + is($item4->sku, 'SKU1111', 'got sku'); + is($item4->quantity, 5, 'quantiy is 5'); + is($item4->price+0, 5.55, 'price is 5.55'); + is($item4->description, 'Line Item SKU 5', 'got description'); + is($item4->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item4->custom, 'custom'); + is($item4->custom, 'custom', 'got custom field'); }; # restore the saved cart merging with the temp cart and verify the results $cart->restore($saved, CART_MODE_MERGE); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 3); - is($cart->subtotal, 28.86); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 3, 'has 3 items'); + is($cart->subtotal+0, 28.86, 'total is 28.86'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 3); + is($items3->count, 3, 'loaded 3 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - is($item5->id, '11111111-1111-1111-1111-111111111111'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU1111'); - is($item5->quantity, 6); - is($item5->price, 1.11); - is($item5->description, 'Line Item SKU 1'); - is($item5->total, 6.66); + is($item5->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item5->cart, $cart->id, 'cart id is set'); + is($item5->sku, 'SKU1111', 'got sku'); + is($item5->quantity, 6, 'quantity is 6'); + is($item5->price+0, 1.11, 'price is 1.11'); + is($item5->description, 'Line Item SKU 1', 'got description'); + is($item5->total+0, 6.66, 'total is 6.66'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - is($item6->id, '22222222-2222-2222-2222-222222222222'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU2222'); - is($item6->quantity, 2); - is($item6->price, 2.22); - is($item6->description, 'Line Item SKU 2'); - is($item6->total, 4.44); + is($item6->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU2222', 'got sku'); + is($item6->quantity, 2, 'quantity is 2'); + is($item6->price+0, 2.22, 'price is 2.22'); + is($item6->description, 'Line Item SKU 2', 'got description'); + is($item6->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; my $item7 = $items3->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - isnt($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $cart->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + isnt($item7->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item7->cart, $cart->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $sit2 = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit2, 'Handel::Iterator'); + is($sit2, 1, 'loaded 1 cart'); + + my $saved2 = $sit2->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 2 items'); my $item9 = $items4->next; isa_ok($item9, 'Handel::Cart::Item'); isa_ok($item9, $itemclass); - is($item9->id, '44444444-4444-4444-4444-444444444444'); - is($item9->cart, $saved2->id); - is($item9->sku, 'SKU4444'); - is($item9->quantity, 4); - is($item9->price, 4.44); - is($item9->description, 'Line Item SKU 4'); - is($item9->total, 17.76); + is($item9->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item9->cart, $saved2->id, 'cart id is set'); + is($item9->sku, 'SKU4444', 'got sku'); + is($item9->quantity, 4, 'quantity is 4'); + is($item9->price+0, 4.44, 'price is 4.44'); + is($item9->description, 'Line Item SKU 4', 'got description'); + is($item9->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item9->custom, 'custom'); + is($item9->custom, 'custom', 'got custom field'); }; my $item10 = $items4->next; isa_ok($item10, 'Handel::Cart::Item'); isa_ok($item10, $itemclass); - is($item10->id, '55555555-5555-5555-5555-555555555555'); - is($item10->cart, $saved2->id); - is($item10->sku, 'SKU1111'); - is($item10->quantity, 5); - is($item10->price, 5.55); - is($item10->description, 'Line Item SKU 5'); - is($item10->total, 27.75); + is($item10->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item10->cart, $saved2->id, 'cart id is set'); + is($item10->sku, 'SKU1111', 'got sku'); + is($item10->quantity, 5, 'quantity is 5'); + is($item10->price+0, 5.55, 'price is 5.55'); + is($item10->description, 'Line Item SKU 5', 'got description'); + is($item10->total+0, 27.75, 'price is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item10->custom, 'custom'); + is($item10->custom, 'custom', 'got custom field'); }; }; t/cart_restore_merge.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 292; + plan tests => 304; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,181 +32,176 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_restore_merge_filter_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## restore saved cart appending items to current cart ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # restore the saved cart merging with the temp cart and verify the results $cart->restore({id => '33333333-3333-3333-3333-333333333333'}, CART_MODE_MERGE); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 3); - is($cart->subtotal, 28.86); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 3, 'has 3 items'); + is($cart->subtotal+0, 28.86, 'subtotal is 28.56'); - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 3); + is($items3->count, 3, 'loaded 3 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - is($item5->id, '11111111-1111-1111-1111-111111111111'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU1111'); - is($item5->quantity, 6); - is($item5->price, 1.11); - is($item5->description, 'Line Item SKU 1'); - is($item5->total, 6.66); + is($item5->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item5->cart, $cart->id, 'cart id is set'); + is($item5->sku, 'SKU1111', 'got sku'); + is($item5->quantity, 6, 'quantity is 6'); + is($item5->price+0, 1.11, 'price is 1.11'); + is($item5->description, 'Line Item SKU 1', 'got description'); + is($item5->total+0, 6.66, 'total is 6.66'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - is($item6->id, '22222222-2222-2222-2222-222222222222'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU2222'); - is($item6->quantity, 2); - is($item6->price, 2.22); - is($item6->description, 'Line Item SKU 2'); - is($item6->total, 4.44); + is($item6->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU2222', 'got sku'); + is($item6->quantity, 2, 'quantity is 2'); + is($item6->price+0, 2.22, 'price is 2.22'); + is($item6->description, 'Line Item SKU 2', 'got description'); + is($item6->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; my $item7 = $items3->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - isnt($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $cart->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + isnt($item7->id, '44444444-4444-4444-4444-444444444444', 'id is different'); + is($item7->cart, $cart->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $sit2 = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit2, 'Handel::Iterator'); + is($sit2, 1, 'loaded 1 cart'); + + my $saved2 = $sit2->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 2 items'); my $item9 = $items4->next; isa_ok($item9, 'Handel::Cart::Item'); isa_ok($item9, $itemclass); - is($item9->id, '44444444-4444-4444-4444-444444444444'); - is($item9->cart, $saved2->id); - is($item9->sku, 'SKU4444'); - is($item9->quantity, 4); - is($item9->price, 4.44); - is($item9->description, 'Line Item SKU 4'); - is($item9->total, 17.76); + is($item9->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item9->cart, $saved2->id, 'cart id is set'); + is($item9->sku, 'SKU4444', 'got sku'); + is($item9->quantity, 4, 'quantity is 4'); + is($item9->price+0, 4.44, 'price is 4.44'); + is($item9->description, 'Line Item SKU 4', 'got description'); + is($item9->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item9->custom, 'custom'); + is($item9->custom, 'custom', 'got custom field'); }; my $item10 = $items4->next; isa_ok($item10, 'Handel::Cart::Item'); isa_ok($item10, $itemclass); - is($item10->id, '55555555-5555-5555-5555-555555555555'); - is($item10->cart, $saved2->id); - is($item10->sku, 'SKU1111'); - is($item10->quantity, 5); - is($item10->price, 5.55); - is($item10->description, 'Line Item SKU 5'); - is($item10->total, 27.75); + is($item10->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item10->cart, $saved2->id, 'cart id is set'); + is($item10->sku, 'SKU1111', 'got sku'); + is($item10->quantity, 5, 'quantity is 5'); + is($item10->price+0, 5.55, 'price is 5.55'); + is($item10->description, 'Line Item SKU 5', 'got description'); + is($item10->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item10->custom, 'custom'); + is($item10->custom, 'custom', 'got custom field'); }; }; t/cart_restore_merge_filter.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 352; + plan tests => 370; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,213 +32,212 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_restore_replace_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## restore saved cart replacing current cart ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'total is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cart id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # load the saved cart - my $saved = $subclass->load({ + my $sit = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit, 'Handel::Iterator'); + is($sit, 1, 'loaded 1 cart'); + + my $saved = $sit->first; isa_ok($saved, 'Handel::Cart'); isa_ok($saved, $subclass); - is($saved->id, '33333333-3333-3333-3333-333333333333'); - is($saved->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved->type, CART_TYPE_SAVED); - is($saved->name, 'Cart 3'); - is($saved->description, 'Saved Cart 1'); - is($saved->count, 2); - is($saved->subtotal, 45.51); + is($saved->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved->type, CART_TYPE_SAVED, 'got saved type'); + is($saved->name, 'Cart 3', 'got name'); + is($saved->description, 'Saved Cart 1', 'got description'); + is($saved->count, 2, 'has 2 items'); + is($saved->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved->custom, 'custom'); + is($saved->custom, 'custom', 'got custom field'); }; - my $items2 = $saved->items(undef, 1); + my $items2 = $saved->items; isa_ok($items2, 'Handel::Iterator'); - is($items2->count, 2); + is($items2->count, 2, 'loaded 2 items'); my $item3 = $items2->next; isa_ok($item3, 'Handel::Cart::Item'); isa_ok($item3, $itemclass); - is($item3->id, '44444444-4444-4444-4444-444444444444'); - is($item3->cart, $saved->id); - is($item3->sku, 'SKU4444'); - is($item3->quantity, 4); - is($item3->price, 4.44); - is($item3->description, 'Line Item SKU 4'); - is($item3->total, 17.76); + is($item3->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item3->cart, $saved->id, 'cart id is set'); + is($item3->sku, 'SKU4444', 'got sku'); + is($item3->quantity, 4, 'quantity is 4'); + is($item3->price+0, 4.44, 'price 4.44'); + is($item3->description, 'Line Item SKU 4', 'got description'); + is($item3->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item3->custom, 'custom'); + is($item3->custom, 'custom', 'got custom field'); }; my $item4 = $items2->next; isa_ok($item4, 'Handel::Cart::Item'); isa_ok($item4, $itemclass); - is($item4->id, '55555555-5555-5555-5555-555555555555'); - is($item4->cart, $saved->id); - is($item4->sku, 'SKU1111'); - is($item4->quantity, 5); - is($item4->price, 5.55); - is($item4->description, 'Line Item SKU 5'); - is($item4->total, 27.75); + is($item4->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item4->cart, $saved->id, 'cart id is set'); + is($item4->sku, 'SKU1111', 'got sku'); + is($item4->quantity, 5, 'quantity is 5'); + is($item4->price+0, 5.55, 'price is 5.55'); + is($item4->description, 'Line Item SKU 5', 'got descirption'); + is($item4->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item4->custom, 'custom'); + is($item4->custom, 'custom', 'got custom field'); }; # restore te saved cart replacing the temp cart and verify the results $cart->restore($saved, CART_MODE_REPLACE); - is($cart->name, 'Cart 3'); - is($cart->description, 'Saved Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 45.51); + is($cart->name, 'Cart 3', 'name is set'); + is($cart->description, 'Saved Cart 1', 'description is set'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 45.51, 'subtotal is 45.51'); - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 2); + is($items3->count, 2, 'loaded 2 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - isnt($item5->id, '44444444-4444-4444-4444-444444444444'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU4444'); - is($item5->quantity, 4); - is($item5->price, 4.44); - is($item5->description, 'Line Item SKU 4'); - is($item5->total, 17.76); + isnt($item5->id, '44444444-4444-4444-4444-444444444444', 'item is different id'); + is($item5->cart, $cart->id, 'cart id is set'); + is($item5->sku, 'SKU4444', 'got sku'); + is($item5->quantity, 4, 'quantity is 4'); + is($item5->price+0, 4.44, 'price is 4.44'); + is($item5->description, 'Line Item SKU 4', 'got description'); + is($item5->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - isnt($item6->id, '55555555-5555-5555-5555-555555555555'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU1111'); - is($item6->quantity, 5); - is($item6->price, 5.55); - is($item6->description, 'Line Item SKU 5'); - is($item6->total, 27.75); + isnt($item6->id, '55555555-5555-5555-5555-555555555555', 'item is different id'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU1111', 'got sku'); + is($item6->quantity, 5, 'quantity is 5'); + is($item6->price+0, 5.55, 'price is 5.55'); + is($item6->description, 'Line Item SKU 5', 'got description'); + is($item6->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $sit2 = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit2, 'Handel::Iterator'); + is($sit2, 1, 'loaded 1 cart'); + + my $saved2 = $sit2->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 4 items'); my $item7 = $items4->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - is($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $saved2->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + is($item7->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item7->cart, $saved2->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; my $item8 = $items4->next; isa_ok($item8, 'Handel::Cart::Item'); isa_ok($item8, $itemclass); - is($item8->id, '55555555-5555-5555-5555-555555555555'); - is($item8->cart, $saved2->id); - is($item8->sku, 'SKU1111'); - is($item8->quantity, 5); - is($item8->price, 5.55); - is($item8->description, 'Line Item SKU 5'); - is($item8->total, 27.75); + is($item8->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item8->cart, $saved2->id, 'cart id is set'); + is($item8->sku, 'SKU1111', 'got sku'); + is($item8->quantity, 5, 'quantity is 5'); + is($item8->price+0, 5.55, 'price is 5.55'); + is($item8->description, 'Line Item SKU 5', 'got description'); + is($item8->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item8->custom, 'custom'); + is($item8->custom, 'custom', 'got custom field'); }; }; t/cart_restore_replace.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 261; + plan tests => 273; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,163 +32,158 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/cart_restore_replace_filter_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## restore saved cart replacing current cart ## just for sanity sake, we're checking all cart and item values { # load the temp cart - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'loaded 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->id, '11111111-1111-1111-1111-111111111111'); - is($cart->shopper, '11111111-1111-1111-1111-111111111111'); - is($cart->type, CART_TYPE_TEMP); - is($cart->name, 'Cart 1'); - is($cart->description, 'Test Temp Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 5.55); + is($cart->id, '11111111-1111-1111-1111-111111111111', 'got cart id'); + is($cart->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); + is($cart->name, 'Cart 1', 'got name'); + is($cart->description, 'Test Temp Cart 1', 'got description'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 5.55, 'subtotal is 5.55'); if ($subclass ne 'Handel::Cart') { - is($cart->custom, 'custom'); + is($cart->custom, 'custom', 'got custom field'); }; - my $items = $cart->items(undef, 1); + my $items = $cart->items; isa_ok($items, 'Handel::Iterator'); - is($items->count, 2); + is($items->count, 2, 'loaded 2 items'); my $item1 = $items->next; isa_ok($item1, 'Handel::Cart::Item'); isa_ok($item1, $itemclass); - is($item1->id, '11111111-1111-1111-1111-111111111111'); - is($item1->cart, $cart->id); - is($item1->sku, 'SKU1111'); - is($item1->quantity, 1); - is($item1->price, 1.11); - is($item1->description, 'Line Item SKU 1'); - is($item1->total, 1.11); + is($item1->id, '11111111-1111-1111-1111-111111111111', 'got item id'); + is($item1->cart, $cart->id, 'cart id is set'); + is($item1->sku, 'SKU1111', 'got sku'); + is($item1->quantity, 1, 'quantity is 1'); + is($item1->price+0, 1.11, 'price is 1.11'); + is($item1->description, 'Line Item SKU 1', 'got description'); + is($item1->total+0, 1.11, 'totla is 1.11'); if ($itemclass ne 'Handel::Cart::Item') { - is($item1->custom, 'custom'); + is($item1->custom, 'custom', 'got custom field'); }; my $item2 = $items->next; isa_ok($item2, 'Handel::Cart::Item'); isa_ok($item2, $itemclass); - is($item2->id, '22222222-2222-2222-2222-222222222222'); - is($item2->cart, $cart->id); - is($item2->sku, 'SKU2222'); - is($item2->quantity, 2); - is($item2->price, 2.22); - is($item2->description, 'Line Item SKU 2'); - is($item2->total, 4.44); + is($item2->id, '22222222-2222-2222-2222-222222222222', 'got item id'); + is($item2->cart, $cart->id, 'cat id is set'); + is($item2->sku, 'SKU2222', 'got sku'); + is($item2->quantity, 2, 'quantity is 2'); + is($item2->price+0, 2.22, 'price is 2.22'); + is($item2->description, 'Line Item SKU 2', 'got description'); + is($item2->total+0, 4.44, 'total is 4.44'); if ($itemclass ne 'Handel::Cart::Item') { - is($item2->custom, 'custom'); + is($item2->custom, 'custom', 'got custom field'); }; # restore te saved cart replacing the temp cart and verify the results $cart->restore({id => '33333333-3333-3333-3333-333333333333'}, CART_MODE_REPLACE); - is($cart->name, 'Cart 3'); - is($cart->description, 'Saved Cart 1'); - is($cart->count, 2); - is($cart->subtotal, 45.51); + is($cart->name, 'Cart 3', 'name is set'); + is($cart->description, 'Saved Cart 1', 'descirption is set'); + is($cart->count, 2, 'has 2 items'); + is($cart->subtotal+0, 45.51, 'subtotal is 45.51'); - my $items3 = $cart->items(undef, 1); + my $items3 = $cart->items; isa_ok($items3, 'Handel::Iterator'); - is($items3->count, 2); + is($items3->count, 2, 'loaded 2 items'); my $item5 = $items3->next; isa_ok($item5, 'Handel::Cart::Item'); isa_ok($item5, $itemclass); - isnt($item5->id, '44444444-4444-4444-4444-444444444444'); - is($item5->cart, $cart->id); - is($item5->sku, 'SKU4444'); - is($item5->quantity, 4); - is($item5->price, 4.44); - is($item5->description, 'Line Item SKU 4'); - is($item5->total, 17.76); + isnt($item5->id, '44444444-4444-4444-4444-444444444444', 'not the same item id'); + is($item5->cart, $cart->id, 'cart is is set'); + is($item5->sku, 'SKU4444', 'got sku'); + is($item5->quantity, 4, 'quantity is 4'); + is($item5->price+0, 4.44, 'price is 4.44'); + is($item5->description, 'Line Item SKU 4', 'got description'); + is($item5->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item5->custom, 'custom'); + is($item5->custom, 'custom', 'got custom field'); }; my $item6 = $items3->next; isa_ok($item6, 'Handel::Cart::Item'); isa_ok($item6, $itemclass); - isnt($item6->id, '55555555-5555-5555-5555-555555555555'); - is($item6->cart, $cart->id); - is($item6->sku, 'SKU1111'); - is($item6->quantity, 5); - is($item6->price, 5.55); - is($item6->description, 'Line Item SKU 5'); - is($item6->total, 27.75); + isnt($item6->id, '55555555-5555-5555-5555-555555555555', 'items has different it'); + is($item6->cart, $cart->id, 'cart id is set'); + is($item6->sku, 'SKU1111', 'got sku'); + is($item6->quantity, 5, 'quantity is 5'); + is($item6->price+0, 5.55, 'price is 5.55'); + is($item6->description, 'Line Item SKU 5', 'got description'); + is($item6->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item6->custom, 'custom'); + is($item6->custom, 'custom', 'got custom field'); }; # load the saved cart again - my $saved2 = $subclass->load({ + my $sit2 = $subclass->search({ id => '33333333-3333-3333-3333-333333333333' }); + isa_ok($sit2, 'Handel::Iterator'); + is($sit2, 1, 'loaded 1 item'); + + my $saved2 = $sit2->first; isa_ok($saved2, 'Handel::Cart'); isa_ok($saved2, $subclass); - is($saved2->id, '33333333-3333-3333-3333-333333333333'); - is($saved2->shopper, '33333333-3333-3333-3333-333333333333'); - is($saved2->type, CART_TYPE_SAVED); - is($saved2->name, 'Cart 3'); - is($saved2->description, 'Saved Cart 1'); - is($saved2->count, 2); - is($saved2->subtotal, 45.51); + is($saved2->id, '33333333-3333-3333-3333-333333333333', 'got cart id'); + is($saved2->shopper, '33333333-3333-3333-3333-333333333333', 'got shopper id'); + is($saved2->type, CART_TYPE_SAVED, 'got saved type'); + is($saved2->name, 'Cart 3', 'got name'); + is($saved2->description, 'Saved Cart 1', 'got description'); + is($saved2->count, 2, 'has 2 items'); + is($saved2->subtotal+0, 45.51, 'subtotal is 45.51'); if ($subclass ne 'Handel::Cart') { - is($saved2->custom, 'custom'); + is($saved2->custom, 'custom', 'got custom field'); }; - my $items4 = $saved2->items(undef, 1); + my $items4 = $saved2->items; isa_ok($items4, 'Handel::Iterator'); - is($items4->count, 2); + is($items4->count, 2, 'loaded 2 items'); my $item7 = $items4->next; isa_ok($item7, 'Handel::Cart::Item'); isa_ok($item7, $itemclass); - is($item7->id, '44444444-4444-4444-4444-444444444444'); - is($item7->cart, $saved2->id); - is($item7->sku, 'SKU4444'); - is($item7->quantity, 4); - is($item7->price, 4.44); - is($item7->description, 'Line Item SKU 4'); - is($item7->total, 17.76); + is($item7->id, '44444444-4444-4444-4444-444444444444', 'got item id'); + is($item7->cart, $saved2->id, 'cart id is set'); + is($item7->sku, 'SKU4444', 'got sku'); + is($item7->quantity, 4, 'quantity is 4'); + is($item7->price+0, 4.44, 'price is 4.44'); + is($item7->description, 'Line Item SKU 4', 'got description'); + is($item7->total+0, 17.76, 'total is 17.76'); if ($itemclass ne 'Handel::Cart::Item') { - is($item7->custom, 'custom'); + is($item7->custom, 'custom', 'got custom field'); }; my $item8 = $items4->next; isa_ok($item8, 'Handel::Cart::Item'); isa_ok($item8, $itemclass); - is($item8->id, '55555555-5555-5555-5555-555555555555'); - is($item8->cart, $saved2->id); - is($item8->sku, 'SKU1111'); - is($item8->quantity, 5); - is($item8->price, 5.55); - is($item8->description, 'Line Item SKU 5'); - is($item8->total, 27.75); + is($item8->id, '55555555-5555-5555-5555-555555555555', 'got item id'); + is($item8->cart, $saved2->id, 'cart id is set'); + is($item8->sku, 'SKU1111', 'got sku'); + is($item8->quantity, 5, 'quantity is 5'); + is($item8->price+0, 5.55, 'price is 5.55'); + is($item8->description, 'Line Item SKU 5', 'got description'); + is($item8->total+0, 27.75, 'total is 27.75'); if ($itemclass ne 'Handel::Cart::Item') { - is($item8->custom, 'custom'); + is($item8->custom, 'custom', 'got custom field'); }; }; t/cart_restore_replace_filter.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 32; + plan tests => 71; }; use_ok('Handel::Cart'); @@ -23,6 +23,8 @@ BEGIN { ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -30,60 +32,87 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; + - ## Setup SQLite DB for tests + ## test for Handel::Exception::Constraint for invalid type { - my $dbfile = "t/cart_save_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/cart_create_table.sql'; - my $data = 't/sql/cart_fake_data.sql'; + my $it = $subclass->search({ + id => '11111111-1111-1111-1111-111111111111' + }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); + my $cart = $it->first; + isa_ok($cart, 'Handel::Cart'); + isa_ok($cart, $subclass); + + try { + local $ENV{'LANG'} = 'en'; + $cart->type('abc'); - local $^W = 0; - Handel::DBI->connection($db); + fail('no exception thrown'); + } catch Handel::Exception::Constraint with { + pass('caught constraint exception'); + like(shift, qr/failed database constraint/i, 'failed constraint in message'); + } otherwise { + fail('caught other exception'); + }; }; - ## test for Handel::Exception::Constraint for invalid type + ## test for Handel::Exception::Constraint for blank name { - my $cart = $subclass->load({ - id => '11111111-1111-1111-1111-111111111111' + my $it = $subclass->search({ + id => '22222222-2222-2222-2222-222222222222' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); try { - $cart->type('abc'); + local $ENV{'LANG'} = 'en'; + $cart->name(undef); + $cart->save; - fail; + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/failed database constraint/i, 'failed constraint in message'); } otherwise { - fail; + fail('caught other exception'); }; }; - ## Load a cart, save it and validate type { - my $cart = $subclass->load({ + my $it = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($it, 'Handel::Iterator'); + is($it, 1, 'got 1 cart'); + + my $cart = $it->first; isa_ok($cart, 'Handel::Cart'); isa_ok($cart, $subclass); - is($cart->type, CART_TYPE_TEMP); + is($cart->type, CART_TYPE_TEMP, 'got temp type'); $cart->save; - my $recart = $subclass->load({ + my $reit = $subclass->search({ id => '11111111-1111-1111-1111-111111111111' }); + isa_ok($reit, 'Handel::Iterator'); + is($reit, 1, 'got 1 cart'); + + my $recart = $reit->first; isa_ok($recart, 'Handel::Cart'); isa_ok($recart, $subclass); - is($cart->type, CART_TYPE_SAVED); + is($cart->type, CART_TYPE_SAVED, 'got saved type'); }; }; t/cart_save.t @@ -2,15 +2,21 @@ # $Id$ use strict; use warnings; -use Test::More; -use Cwd; -use File::Path; -use File::Spec::Functions; BEGIN { - eval 'use Catalyst 5.56'; + use lib 't/lib'; + use Handel::Test; + use Cwd; + use File::Path; + use File::Spec::Functions; + + eval 'use Catalyst 5.7001'; + plan(skip_all => + 'Catalyst 5.7001 not installed') if $@; + + eval 'use Catalyst::Devel 1.0'; plan(skip_all => - 'Catalyst 5.56 not installed') if $@; + 'Catalyst::Devel 1.0 not installed') if $@; eval 'use Test::File 1.10'; plan(skip_all => @@ -20,19 +26,24 @@ BEGIN { plan(skip_all => 'Test::File::Contents 0.02 not installed') if $@; - plan tests => 101; + plan tests => 126; use_ok('Catalyst::Helper'); }; -my $helper = Catalyst::Helper->new({short => 1}); +my $helper = Catalyst::Helper->new; my $app = 'TestApp'; +## setup var +chdir('t'); +mkdir('var') unless -d 'var'; +chdir('var'); + + ## create test app { - chdir('t'); - rmtree('TestApp'); + rmtree($app); $helper->mk_app($app); $FindBin::Bin = catdir(cwd, $app, 'lib'); }; @@ -40,199 +51,261 @@ my $app = 'TestApp'; ## create the default cart controller { - my $module = catfile($app, 'lib', $app, 'C', 'Cart.pm'); - my $list = catfile($app, 'root', 'cart', 'list.tt'); - my $view = catfile($app, 'root', 'cart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'Cart.pm'); + my $list = catfile($app, 'root', 'cart', 'list'); + my $view = catfile($app, 'root', 'cart', 'default'); + my $messages = catfile($app, 'root', 'cart', 'messages.yml'); + my $profiles = catfile($app, 'root', 'cart', 'profiles.yml'); $helper->mk_component($app, 'controller', 'Cart', 'Handel::Cart'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('Cart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'cart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'cart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'cart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'cart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_exists_ok($messages); + file_exists_ok($profiles); + file_contents_like($module, qr/->model\('Cart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'cart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/cart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'cart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/cart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/cart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); + file_contents_like($messages, qr/^cart\/save:/); + file_contents_like($profiles, qr/^cart\/save:/); +}; + + +## load it up +{ + my $lib = catfile(cwd, $app, 'lib'); + eval "use lib '$lib';use $app\:\:Controller\:\:Cart"; + ok(!$@, 'loaded new class'); }; ## create a two part default cart controller { - my $module = catfile($app, 'lib', $app, 'C', 'My', 'Cart.pm'); - my $list = catfile($app, 'root', 'my', 'cart', 'list.tt'); - my $view = catfile($app, 'root', 'my', 'cart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'My', 'Cart.pm'); + my $list = catfile($app, 'root', 'my', 'cart', 'list'); + my $view = catfile($app, 'root', 'my', 'cart', 'default'); $helper->mk_component($app, 'controller', 'My::Cart', 'Handel::Cart'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('Cart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'my\/cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'my\/cart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'my\/cart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_contents_like($module, qr/->model\('Cart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/cart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; ## create a controller with a non-default model class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyCart.pm'); - my $list = catfile($app, 'root', 'mycart', 'list.tt'); - my $view = catfile($app, 'root', 'mycart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyCart.pm'); + my $list = catfile($app, 'root', 'mycart', 'list'); + my $view = catfile($app, 'root', 'mycart', 'default'); $helper->mk_component($app, 'controller', 'MyCart', 'Handel::Cart', 'MyCartModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyCartModel'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'mycart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyCartModel'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mycart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mycart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/mycart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; ## create a controller with a non-default two part model class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyOtherCart.pm'); - my $list = catfile($app, 'root', 'myothercart', 'list.tt'); - my $view = catfile($app, 'root', 'myothercart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyOtherCart.pm'); + my $list = catfile($app, 'root', 'myothercart', 'list'); + my $view = catfile($app, 'root', 'myothercart', 'default'); $helper->mk_component($app, 'controller', 'MyOtherCart', 'Handel::Cart', 'My::Cart::Model'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('My::Cart::Model'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myothercart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myothercart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'myothercart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_contents_like($module, qr/->model\('My::Cart::Model'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myothercart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myothercart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/myothercart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; ## create a controller with a non-default fully qualified model class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyNewCart.pm'); - my $list = catfile($app, 'root', 'mynewcart', 'list.tt'); - my $view = catfile($app, 'root', 'mynewcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyNewCart.pm'); + my $list = catfile($app, 'root', 'mynewcart', 'list'); + my $view = catfile($app, 'root', 'mynewcart', 'default'); $helper->mk_component($app, 'controller', 'MyNewCart', 'Handel::Cart', 'TestApp::M::MyNewCartModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyNewCartModel'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mynewcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mynewcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'mynewcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyNewCartModel'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mynewcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mynewcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/mynewcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; ## create a controller with a non-default fully qualified model class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyThirdCart.pm'); - my $list = catfile($app, 'root', 'mythirdcart', 'list.tt'); - my $view = catfile($app, 'root', 'mythirdcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyThirdCart.pm'); + my $list = catfile($app, 'root', 'mythirdcart', 'list'); + my $view = catfile($app, 'root', 'mythirdcart', 'default'); $helper->mk_component($app, 'controller', 'MyThirdCart', 'Handel::Cart', 'TestApp::Model::MyNewCartModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyNewCartModel'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mythirdcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mythirdcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'mythirdcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyNewCartModel'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mythirdcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mythirdcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/mythirdcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; ## create a controller with a non-default checkout class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyCustomCart.pm'); - my $list = catfile($app, 'root', 'mycustomcart', 'list.tt'); - my $view = catfile($app, 'root', 'mycustomcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyCustomCart.pm'); + my $list = catfile($app, 'root', 'mycustomcart', 'list'); + my $view = catfile($app, 'root', 'mycustomcart', 'default'); $helper->mk_component($app, 'controller', 'MyCustomCart', 'Handel::Cart', 'MyCart', 'MyCheckout'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyCart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycustomcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycustomcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycustomcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycustomcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'mycustomcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'mycheckout\/' %\]/); + file_contents_like($module, qr/->model\('MyCart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycustomcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mycustomcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycustomcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mycustomcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/mycustomcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/mycheckout\/'\) %\]/); }; ## create a controller with a two part checkout class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyBestCart.pm'); - my $list = catfile($app, 'root', 'mybestcart', 'list.tt'); - my $view = catfile($app, 'root', 'mybestcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyBestCart.pm'); + my $list = catfile($app, 'root', 'mybestcart', 'list'); + my $view = catfile($app, 'root', 'mybestcart', 'default'); $helper->mk_component($app, 'controller', 'MyBestCart', 'Handel::Cart', 'MyCart', 'My::Checkout'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyCart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mybestcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mybestcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mybestcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mybestcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'mybestcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'my\/checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyCart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mybestcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mybestcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mybestcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mybestcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/mybestcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/checkout\/'\) %\]/); }; ## create a controller with a fully qualified checkout class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyWorstCart.pm'); - my $list = catfile($app, 'root', 'myworstcart', 'list.tt'); - my $view = catfile($app, 'root', 'myworstcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyWorstCart.pm'); + my $list = catfile($app, 'root', 'myworstcart', 'list'); + my $view = catfile($app, 'root', 'myworstcart', 'default'); $helper->mk_component($app, 'controller', 'MyWorstCart', 'Handel::Cart', 'MyCart', 'TestApp::C::My::Checkout'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyCart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myworstcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myworstcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myworstcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myworstcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'myworstcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'my\/checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyCart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myworstcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myworstcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myworstcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myworstcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/myworstcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/checkout\/'\) %\]/); }; ## create a controller with a fully qualified checkout class name { - my $module = catfile($app, 'lib', $app, 'C', 'MyFQCart.pm'); - my $list = catfile($app, 'root', 'myfqcart', 'list.tt'); - my $view = catfile($app, 'root', 'myfqcart', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyFQCart.pm'); + my $list = catfile($app, 'root', 'myfqcart', 'list'); + my $view = catfile($app, 'root', 'myfqcart', 'default'); $helper->mk_component($app, 'controller', 'MyFQCart', 'Handel::Cart', 'MyCart', 'TestApp::Controller::My::Checkout'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyCart'\)->uuid/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myfqcart\/view.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myfqcart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myfqcart\/list.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myfqcart\/list\/'\);/); - file_contents_like($view, qr/\[% base _ 'myfqcart\/list\/' %\]/); - file_contents_like($view, qr/\[% base _ 'my\/checkout\/' %\]/); + file_contents_like($module, qr/->model\('MyCart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myfqcart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myfqcart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myfqcart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myfqcart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/myfqcart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/checkout\/'\) %\]/); +}; + + +## create a controller with a faulty model +{ + my $module = catfile($app, 'lib', $app, 'Controller', 'My', 'Cart.pm'); + my $list = catfile($app, 'root', 'my', 'cart', 'list'); + my $view = catfile($app, 'root', 'my', 'cart', 'default'); + + unlink $module; + unlink $list; + unlink $view; + + $helper->mk_component($app, 'controller', 'My::Cart', 'Handel::Cart', 'TestApp::Model::'); + file_exists_ok($module); + file_exists_ok($list); + file_exists_ok($view); + file_contents_like($module, qr/->model\('Cart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/cart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); +}; + + +## create a controller with a faulty checkout +{ + my $module = catfile($app, 'lib', $app, 'Controller', 'My', 'Cart.pm'); + my $list = catfile($app, 'root', 'my', 'cart', 'list'); + my $view = catfile($app, 'root', 'my', 'cart', 'default'); + + unlink $module; + unlink $list; + unlink $view; + + $helper->mk_component($app, 'controller', 'My::Cart', 'Handel::Cart', 'Cart', 'TestApp::Controller::'); + file_exists_ok($module); + file_exists_ok($list); + file_exists_ok($view); + file_contents_like($module, qr/->model\('Cart'\)->storage->new_uuid/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/default';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/'\)\);/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'my\/cart\/list';/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/my\/cart\/list\/'\)\);/); + file_contents_like($view, qr/\[% c.uri_for\('\/my\/cart\/save\/'\) %\]/); + file_contents_like($view, qr/\[% c.uri_for\('\/checkout\/'\) %\]/); }; t/catalyst_helpers_controller_cart.t @@ -2,15 +2,21 @@ # $Id$ use strict; use warnings; -use Test::More; -use Cwd; -use File::Path; -use File::Spec::Functions; BEGIN { - eval 'use Catalyst 5.56'; + use lib 't/lib'; + use Handel::Test; + use Cwd; + use File::Path; + use File::Spec::Functions; + + eval 'use Catalyst 5.7001'; + plan(skip_all => + 'Catalyst 5.7001 not installed') if $@; + + eval 'use Catalyst::Devel 1.0'; plan(skip_all => - 'Catalyst 5.56 not installed') if $@; + 'Catalyst::Devel 1.0 not installed') if $@; eval 'use Test::File 1.10'; plan(skip_all => @@ -20,19 +26,24 @@ BEGIN { plan(skip_all => 'Test::File::Contents 0.02 not installed') if $@; - plan tests => 91; + plan tests => 94; use_ok('Catalyst::Helper'); }; -my $helper = Catalyst::Helper->new({short => 1}); +my $helper = Catalyst::Helper->new; my $app = 'TestApp'; +## setup var +chdir('t'); +mkdir('var') unless -d 'var'; +chdir('var'); + + ## create test app { - chdir('t'); - rmtree('TestApp'); + rmtree($app); $helper->mk_app($app); $FindBin::Bin = catdir(cwd, $app, 'lib'); }; @@ -40,11 +51,13 @@ my $app = 'TestApp'; ## create the default checkout controller { - my $module = catfile($app, 'lib', $app, 'C', 'Checkout.pm'); - my $edit = catfile($app, 'root', 'checkout', 'edit.tt'); - my $preview = catfile($app, 'root', 'checkout', 'preview.tt'); - my $payment = catfile($app, 'root', 'checkout', 'payment.tt'); - my $complete = catfile($app, 'root', 'checkout', 'complete.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'Checkout.pm'); + my $edit = catfile($app, 'root', 'checkout', 'billing'); + my $preview = catfile($app, 'root', 'checkout', 'preview'); + my $payment = catfile($app, 'root', 'checkout', 'payment'); + my $complete = catfile($app, 'root', 'checkout', 'complete'); + my $messages = catfile($app, 'root', 'checkout', 'messages.yml'); + my $profiles = catfile($app, 'root', 'checkout', 'profiles.yml'); $helper->mk_component($app, 'controller', 'Checkout', 'Handel::Checkout'); file_exists_ok($module); @@ -52,30 +65,40 @@ my $app = 'TestApp'; file_exists_ok($preview); file_exists_ok($payment); file_exists_ok($complete); + file_exists_ok($messages); + file_exists_ok($profiles); + file_contents_like($module, qr/->controller\('Cart'\)/); + file_contents_like($module, qr/->controller\('Order'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/checkout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/checkout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/checkout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/checkout\/payment\/'\) %\]/); + file_contents_like($messages, qr/^checkout\/view:/); + file_contents_like($profiles, qr/^checkout\/view:/); +}; + - file_contents_like($module, qr/->model\('Cart'\)->load/); - file_contents_like($module, qr/->model\('Orders'\)->load/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/edit.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'checkout\/preview\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/payment.tt';/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/complete.tt';/); - file_contents_like($edit, qr/\[% base _ 'cart\/' %\]/); - file_contents_like($edit, qr/\[% base _ 'checkout\/update\/' %\]/); - file_contents_like($preview, qr/\[% base _ 'checkout\/edit\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'checkout\/preview\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'checkout\/payment\/' %\]/); - file_contents_like($complete, qr/\[% base _ 'orders\/list\/' %\]/); +## load it up +SKIP: { + eval 'require HTML::FillInForm'; + skip 'HTML::FillInForm not installed', 1 if $@; + + my $lib = catfile(cwd, $app, 'lib'); + eval "use lib '$lib';use $app\:\:Controller\:\:Checkout"; + ok(!$@, 'loaded new class'); }; ## create the checkout controller with custom model/controller args { - my $module = catfile($app, 'lib', $app, 'C', 'MyCheckout.pm'); - my $edit = catfile($app, 'root', 'mycheckout', 'edit.tt'); - my $preview = catfile($app, 'root', 'mycheckout', 'preview.tt'); - my $payment = catfile($app, 'root', 'mycheckout', 'payment.tt'); - my $complete = catfile($app, 'root', 'mycheckout', 'complete.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyCheckout.pm'); + my $edit = catfile($app, 'root', 'mycheckout', 'billing'); + my $preview = catfile($app, 'root', 'mycheckout', 'preview'); + my $payment = catfile($app, 'root', 'mycheckout', 'payment'); + my $complete = catfile($app, 'root', 'mycheckout', 'complete'); $helper->mk_component($app, 'controller', 'MyCheckout', 'Handel::Checkout', 'MyCartModel', 'MyOrdersModel', 'MyCart', 'MyOrders'); file_exists_ok($module); @@ -84,29 +107,25 @@ my $app = 'TestApp'; file_exists_ok($payment); file_exists_ok($complete); - file_contents_like($module, qr/->model\('MyCartModel'\)->load/); - file_contents_like($module, qr/->model\('MyOrdersModel'\)->load/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/edit.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mycheckout\/preview\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/payment.tt';/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/complete.tt';/); - file_contents_like($edit, qr/\[% base _ 'mycart\/' %\]/); - file_contents_like($edit, qr/\[% base _ 'mycheckout\/update\/' %\]/); - file_contents_like($preview, qr/\[% base _ 'mycheckout\/edit\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mycheckout\/preview\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mycheckout\/payment\/' %\]/); - file_contents_like($complete, qr/\[% base _ 'myorders\/list\/' %\]/); + file_contents_like($module, qr/->controller\('MyCart'\)/); + file_contents_like($module, qr/->controller\('MyOrders'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mycheckout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mycheckout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/mycheckout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/mycheckout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/mycheckout\/payment\/'\) %\]/); }; ## create the checkout controller with custom two part model/controller args { - my $module = catfile($app, 'lib', $app, 'C', 'MyNewCheckout.pm'); - my $edit = catfile($app, 'root', 'mynewcheckout', 'edit.tt'); - my $preview = catfile($app, 'root', 'mynewcheckout', 'preview.tt'); - my $payment = catfile($app, 'root', 'mynewcheckout', 'payment.tt'); - my $complete = catfile($app, 'root', 'mynewcheckout', 'complete.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyNewCheckout.pm'); + my $edit = catfile($app, 'root', 'mynewcheckout', 'billing'); + my $preview = catfile($app, 'root', 'mynewcheckout', 'preview'); + my $payment = catfile($app, 'root', 'mynewcheckout', 'payment'); + my $complete = catfile($app, 'root', 'mynewcheckout', 'complete'); $helper->mk_component($app, 'controller', 'MyNewCheckout', 'Handel::Checkout', 'My::CartModel', 'My::OrdersModel', 'My::Cart', 'My::Orders'); file_exists_ok($module); @@ -115,29 +134,25 @@ my $app = 'TestApp'; file_exists_ok($payment); file_exists_ok($complete); - file_contents_like($module, qr/->model\('My::CartModel'\)->load/); - file_contents_like($module, qr/->model\('My::OrdersModel'\)->load/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'my\/cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/edit.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mynewcheckout\/preview\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/payment.tt';/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/complete.tt';/); - file_contents_like($edit, qr/\[% base _ 'my\/cart\/' %\]/); - file_contents_like($edit, qr/\[% base _ 'mynewcheckout\/update\/' %\]/); - file_contents_like($preview, qr/\[% base _ 'mynewcheckout\/edit\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mynewcheckout\/preview\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mynewcheckout\/payment\/' %\]/); - file_contents_like($complete, qr/\[% base _ 'my\/orders\/list\/' %\]/); + file_contents_like($module, qr/->controller\('My::Cart'\)/); + file_contents_like($module, qr/->controller\('My::Orders'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mynewcheckout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mynewcheckout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/mynewcheckout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/mynewcheckout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/mynewcheckout\/payment\/'\) %\]/); }; ## create the checkout controller with custom fully qualified part model/controller args { - my $module = catfile($app, 'lib', $app, 'C', 'MyOtherCheckout.pm'); - my $edit = catfile($app, 'root', 'myothercheckout', 'edit.tt'); - my $preview = catfile($app, 'root', 'myothercheckout', 'preview.tt'); - my $payment = catfile($app, 'root', 'myothercheckout', 'payment.tt'); - my $complete = catfile($app, 'root', 'myothercheckout', 'complete.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyOtherCheckout.pm'); + my $edit = catfile($app, 'root', 'myothercheckout', 'billing'); + my $preview = catfile($app, 'root', 'myothercheckout', 'preview'); + my $payment = catfile($app, 'root', 'myothercheckout', 'payment'); + my $complete = catfile($app, 'root', 'myothercheckout', 'complete'); $helper->mk_component($app, 'controller', 'MyOtherCheckout', 'Handel::Checkout', 'TestApp::M::My::CartModel', 'TestApp::M::My::OrdersModel', 'TestApp::C::My::Cart', 'TestApp::C::My::Orders'); file_exists_ok($module); @@ -146,29 +161,25 @@ my $app = 'TestApp'; file_exists_ok($payment); file_exists_ok($complete); - file_contents_like($module, qr/->model\('My::CartModel'\)->load/); - file_contents_like($module, qr/->model\('My::OrdersModel'\)->load/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'my\/cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/edit.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'myothercheckout\/preview\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/payment.tt';/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/complete.tt';/); - file_contents_like($edit, qr/\[% base _ 'my\/cart\/' %\]/); - file_contents_like($edit, qr/\[% base _ 'myothercheckout\/update\/' %\]/); - file_contents_like($preview, qr/\[% base _ 'myothercheckout\/edit\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'myothercheckout\/preview\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'myothercheckout\/payment\/' %\]/); - file_contents_like($complete, qr/\[% base _ 'my\/orders\/list\/' %\]/); + file_contents_like($module, qr/->controller\('My::Cart'\)/); + file_contents_like($module, qr/->controller\('My::Orders'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/myothercheckout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'myothercheckout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/myothercheckout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/myothercheckout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/myothercheckout\/payment\/'\) %\]/); }; ## create the checkout controller with custom fully qualified part model/controller args { - my $module = catfile($app, 'lib', $app, 'C', 'MyThirdCheckout.pm'); - my $edit = catfile($app, 'root', 'mythirdcheckout', 'edit.tt'); - my $preview = catfile($app, 'root', 'mythirdcheckout', 'preview.tt'); - my $payment = catfile($app, 'root', 'mythirdcheckout', 'payment.tt'); - my $complete = catfile($app, 'root', 'mythirdcheckout', 'complete.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyThirdCheckout.pm'); + my $edit = catfile($app, 'root', 'mythirdcheckout', 'billing'); + my $preview = catfile($app, 'root', 'mythirdcheckout', 'preview'); + my $payment = catfile($app, 'root', 'mythirdcheckout', 'payment'); + my $complete = catfile($app, 'root', 'mythirdcheckout', 'complete'); $helper->mk_component($app, 'controller', 'MyThirdCheckout', 'Handel::Checkout', 'TestApp::Model::My::CartModel', 'TestApp::Model::My::OrdersModel', 'TestApp::Controller::My::Cart', 'TestApp::Controller::My::Orders'); file_exists_ok($module); @@ -177,17 +188,53 @@ my $app = 'TestApp'; file_exists_ok($payment); file_exists_ok($complete); - file_contents_like($module, qr/->model\('My::CartModel'\)->load/); - file_contents_like($module, qr/->model\('My::OrdersModel'\)->load/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'my\/cart\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/edit.tt';/); - file_contents_like($module, qr/\$c->res->redirect\(\$c->req->base . 'mythirdcheckout\/preview\/'\);/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/payment.tt';/); - file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/complete.tt';/); - file_contents_like($edit, qr/\[% base _ 'my\/cart\/' %\]/); - file_contents_like($edit, qr/\[% base _ 'mythirdcheckout\/update\/' %\]/); - file_contents_like($preview, qr/\[% base _ 'mythirdcheckout\/edit\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mythirdcheckout\/preview\/' %\]/); - file_contents_like($payment, qr/\[% base _ 'mythirdcheckout\/payment\/' %\]/); - file_contents_like($complete, qr/\[% base _ 'my\/orders\/list\/' %\]/); + file_contents_like($module, qr/->controller\('My::Cart'\)/); + file_contents_like($module, qr/->controller\('My::Orders'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/mythirdcheckout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'mythirdcheckout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/mythirdcheckout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/mythirdcheckout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/mythirdcheckout\/payment\/'\) %\]/); +}; + + +## create the default checkout controller with bogus controller/models +{ + my $module = catfile($app, 'lib', $app, 'Controller', 'Checkout.pm'); + my $edit = catfile($app, 'root', 'checkout', 'billing'); + my $preview = catfile($app, 'root', 'checkout', 'preview'); + my $payment = catfile($app, 'root', 'checkout', 'payment'); + my $complete = catfile($app, 'root', 'checkout', 'complete'); + my $messages = catfile($app, 'root', 'checkout', 'messages.yml'); + my $profiles = catfile($app, 'root', 'checkout', 'profiles.yml'); + + unlink $module; + unlink $edit; + unlink $preview; + unlink $payment; + unlink $complete; + unlink $messages; + unlink $profiles; + + $helper->mk_component($app, 'controller', 'Checkout', 'Handel::Checkout', 'TestApp::Model::', 'TestApp::Model::', 'TestApp::Controller::', 'TestApp::Controller::'); + file_exists_ok($module); + file_exists_ok($edit); + file_exists_ok($preview); + file_exists_ok($payment); + file_exists_ok($complete); + file_exists_ok($messages); + file_exists_ok($profiles); + file_contents_like($module, qr/->controller\('Cart'\)/); + file_contents_like($module, qr/->controller\('Order'\)/); + file_contents_like($module, qr/\$c->res->redirect\(\$c->uri_for\('\/checkout\/'\)/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/billing';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/payment';/); + file_contents_like($module, qr/\$c->stash->{'template'} = 'checkout\/complete';/); + file_contents_like($edit, qr/\[% c.uri_for\('\/checkout\/billing\/'\) %\]/); + file_contents_like($preview, qr/\[% c.uri_for\('\/checkout\/payment\/'\) %\]/); + file_contents_like($payment, qr/\[% c.uri_for\('\/checkout\/payment\/'\) %\]/); + file_contents_like($messages, qr/^checkout\/view:/); + file_contents_like($profiles, qr/^checkout\/view:/); }; t/catalyst_helpers_controller_checkout.t @@ -2,15 +2,21 @@ # $Id$ use strict; use warnings; -use Test::More; -use Cwd; -use File::Path; -use File::Spec::Functions; BEGIN { - eval 'use Catalyst 5.56'; + use lib 't/lib'; + use Handel::Test; + use Cwd; + use File::Path; + use File::Spec::Functions; + + eval 'use Catalyst 5.7001'; + plan(skip_all => + 'Catalyst 5.7001 not installed') if $@; + + eval 'use Catalyst::Devel 1.0'; plan(skip_all => - 'Catalyst 5.56 not installed') if $@; + 'Catalyst::Devel 1.0 not installed') if $@; eval 'use Test::File 1.10'; plan(skip_all => @@ -20,19 +26,24 @@ BEGIN { plan(skip_all => 'Test::File::Contents 0.02 not installed') if $@; - plan tests => 46; + plan tests => 58; use_ok('Catalyst::Helper'); }; -my $helper = Catalyst::Helper->new({short => 1}); +my $helper = Catalyst::Helper->new; my $app = 'TestApp'; +## setup var +chdir('t'); +mkdir('var') unless -d 'var'; +chdir('var'); + + ## create test app { - chdir('t'); - rmtree('TestApp'); + rmtree($app); $helper->mk_app($app); $FindBin::Bin = catdir(cwd, $app, 'lib'); }; @@ -40,94 +51,133 @@ my $app = 'TestApp'; ## create the default order controller { - my $module = catfile($app, 'lib', $app, 'C', 'Orders.pm'); - my $list = catfile($app, 'root', 'orders', 'list.tt'); - my $view = catfile($app, 'root', 'orders', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'Orders.pm'); + my $list = catfile($app, 'root', 'orders', 'default'); + my $view = catfile($app, 'root', 'orders', 'view'); + my $messages = catfile($app, 'root', 'orders', 'messages.yml'); + my $profiles = catfile($app, 'root', 'orders', 'profiles.yml'); $helper->mk_component($app, 'controller', 'Orders', 'Handel::Order'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('Orders'\)->load/); - file_contents_like($module, qr/= 'orders\/view.tt'/); - file_contents_like($module, qr/= 'orders\/list.tt'/); - file_contents_like($view, qr/\[% base _ 'orders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'orders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'orders\/view\/'/); + file_exists_ok($messages); + file_exists_ok($profiles); + file_contents_like($module, qr/->model\('Order'\)/); + file_contents_like($module, qr/= 'orders\/view'/); + file_contents_like($module, qr/= 'orders\/default'/); + file_contents_like($view, qr/INCLUDE orders\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/orders\/view'/); + file_contents_like($messages, qr/^orders\/view:/); + file_contents_like($profiles, qr/^orders\/view:/); +}; + + +## load it up +{ + my $lib = catfile(cwd, $app, 'lib'); + eval "use lib '$lib';use $app\:\:Controller\:\:Orders"; + ok(!$@, 'loaded new class'); }; ## create the default order controller with custom model name { - my $module = catfile($app, 'lib', $app, 'C', 'MyOrders.pm'); - my $list = catfile($app, 'root', 'myorders', 'list.tt'); - my $view = catfile($app, 'root', 'myorders', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyOrders.pm'); + my $list = catfile($app, 'root', 'myorders', 'default'); + my $view = catfile($app, 'root', 'myorders', 'view'); $helper->mk_component($app, 'controller', 'MyOrders', 'Handel::Order', 'MyOrderModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('MyOrderModel'\)->load/); - file_contents_like($module, qr/= 'myorders\/view.tt'/); - file_contents_like($module, qr/= 'myorders\/list.tt'/); - file_contents_like($view, qr/\[% base _ 'myorders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'myorders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'myorders\/view\/'/); + file_contents_like($module, qr/->model\('MyOrderModel'\)/); + file_contents_like($module, qr/= 'myorders\/view'/); + file_contents_like($module, qr/= 'myorders\/default'/); + file_contents_like($view, qr/INCLUDE myorders\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/myorders\/view'/); }; ## create the default order controller with custom two part model name { - my $module = catfile($app, 'lib', $app, 'C', 'MyOtherOrders.pm'); - my $list = catfile($app, 'root', 'myotherorders', 'list.tt'); - my $view = catfile($app, 'root', 'myotherorders', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyOtherOrders.pm'); + my $list = catfile($app, 'root', 'myotherorders', 'default'); + my $view = catfile($app, 'root', 'myotherorders', 'view'); $helper->mk_component($app, 'controller', 'MyOtherOrders', 'Handel::Order', 'My::OrderModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('My::OrderModel'\)->load/); - file_contents_like($module, qr/= 'myotherorders\/view.tt'/); - file_contents_like($module, qr/= 'myotherorders\/list.tt'/); - file_contents_like($view, qr/\[% base _ 'myotherorders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'myotherorders\/' %\]/); - file_contents_like($list, qr/\[% base _ 'myotherorders\/view\/'/); + file_contents_like($module, qr/->model\('My::OrderModel'\)/); + file_contents_like($module, qr/= 'myotherorders\/view'/); + file_contents_like($module, qr/= 'myotherorders\/default'/); + file_contents_like($view, qr/INCLUDE myotherorders\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/myotherorders\/view'/); }; ## create the default order controller with fully qualified model name { - my $module = catfile($app, 'lib', $app, 'C', 'MyCustomOrder.pm'); - my $list = catfile($app, 'root', 'mycustomorder', 'list.tt'); - my $view = catfile($app, 'root', 'mycustomorder', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyCustomOrder.pm'); + my $list = catfile($app, 'root', 'mycustomorder', 'default'); + my $view = catfile($app, 'root', 'mycustomorder', 'view'); $helper->mk_component($app, 'controller', 'MyCustomOrder', 'Handel::Order', 'TestApp::M::My::OrderModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('My::OrderModel'\)->load/); - file_contents_like($module, qr/= 'mycustomorder\/view.tt'/); - file_contents_like($module, qr/= 'mycustomorder\/list.tt'/); - file_contents_like($view, qr/\[% base _ 'mycustomorder\/' %\]/); - file_contents_like($list, qr/\[% base _ 'mycustomorder\/' %\]/); - file_contents_like($list, qr/\[% base _ 'mycustomorder\/view\/'/); + file_contents_like($module, qr/->model\('My::OrderModel'\)/); + file_contents_like($module, qr/= 'mycustomorder\/view'/); + file_contents_like($module, qr/= 'mycustomorder\/default'/); + file_contents_like($view, qr/INCLUDE mycustomorder\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/mycustomorder\/view'/); }; ## create the default order controller with fully qualified model name { - my $module = catfile($app, 'lib', $app, 'C', 'MyThirdOrder.pm'); - my $list = catfile($app, 'root', 'mythirdorder', 'list.tt'); - my $view = catfile($app, 'root', 'mythirdorder', 'view.tt'); + my $module = catfile($app, 'lib', $app, 'Controller', 'MyThirdOrder.pm'); + my $list = catfile($app, 'root', 'mythirdorder', 'default'); + my $view = catfile($app, 'root', 'mythirdorder', 'view'); $helper->mk_component($app, 'controller', 'MyThirdOrder', 'Handel::Order', 'TestApp::Model::My::OrderModel'); file_exists_ok($module); file_exists_ok($list); file_exists_ok($view); - file_contents_like($module, qr/->model\('My::OrderModel'\)->load/); - file_contents_like($module, qr/= 'mythirdorder\/view.tt'/); - file_contents_like($module, qr/= 'mythirdorder\/list.tt'/); - file_contents_like($view, qr/\[% base _ 'mythirdorder\/' %\]/); - file_contents_like($list, qr/\[% base _ 'mythirdorder\/' %\]/); - file_contents_like($list, qr/\[% base _ 'mythirdorder\/view\/'/); + file_contents_like($module, qr/->model\('My::OrderModel'\)/); + file_contents_like($module, qr/= 'mythirdorder\/view'/); + file_contents_like($module, qr/= 'mythirdorder\/default'/); + file_contents_like($view, qr/INCLUDE mythirdorder\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/mythirdorder\/view'/); +}; + + +## create the default order controller with bogus order model +{ + my $module = catfile($app, 'lib', $app, 'Controller', 'Orders.pm'); + my $list = catfile($app, 'root', 'orders', 'default'); + my $view = catfile($app, 'root', 'orders', 'view'); + my $messages = catfile($app, 'root', 'orders', 'messages.yml'); + my $profiles = catfile($app, 'root', 'orders', 'profiles.yml'); + + unlink $module; + unlink $list; + unlink $view; + unlink $messages; + unlink $profiles; + + $helper->mk_component($app, 'controller', 'Orders', 'Handel::Order', 'TestApp::Model::'); + file_exists_ok($module); + file_exists_ok($list); + file_exists_ok($view); + file_exists_ok($messages); + file_exists_ok($profiles); + file_contents_like($module, qr/->model\('Order'\)/); + file_contents_like($module, qr/= 'orders\/view'/); + file_contents_like($module, qr/= 'orders\/default'/); + file_contents_like($view, qr/INCLUDE orders\/errors/); + file_contents_like($list, qr/\[% c.uri_for\('\/orders\/view'/); + file_contents_like($messages, qr/^orders\/view:/); + file_contents_like($profiles, qr/^orders\/view:/); }; t/catalyst_helpers_controller_order.t @@ -2,15 +2,21 @@ # $Id$ use strict; use warnings; -use Test::More; -use Cwd; -use File::Path; -use File::Spec::Functions; BEGIN { - eval 'use Catalyst 5.56'; + use lib 't/lib'; + use Handel::Test; + use Cwd; + use File::Path; + use File::Spec::Functions; + + eval 'use Catalyst 5.7001'; + plan(skip_all => + 'Catalyst 5.7001 not installed') if $@; + + eval 'use Catalyst::Devel 1.0'; plan(skip_all => - 'Catalyst 5.56 not installed') if $@; + 'Catalyst::Devel 1.0 not installed') if $@; eval 'use Test::File 1.10'; plan(skip_all => @@ -20,20 +26,24 @@ BEGIN { plan(skip_all => 'Test::File::Contents 0.02 not installed') if $@; - plan tests => 5; + plan tests => 8; use_ok('Catalyst::Helper'); }; -my $helper = Catalyst::Helper->new({short => 1}); +my $helper = Catalyst::Helper->new; my $app = 'TestApp'; +## setup var +chdir('t'); +mkdir('var') unless -d 'var'; +chdir('var'); + + ## create the test app { - chdir('t'); - rmtree('TestApp'); - + rmtree($app); $helper->mk_app($app); $FindBin::Bin = catdir(cwd, $app, 'lib'); }; @@ -41,10 +51,27 @@ my $app = 'TestApp'; ## create the default model { - my $module = catfile($app, 'lib', $app, 'M', 'Cart.pm'); + my $module = catfile($app, 'lib', $app, 'Model', 'Cart.pm'); $helper->mk_component($app, 'model', 'Cart', 'Handel::Cart', 'testdsn', 'testuser', 'testpass'); file_exists_ok($module); file_contents_like($module, qr/'testdsn'/); file_contents_like($module, qr/'testuser'/); file_contents_like($module, qr/'testpass'/); }; + + +## create the default model without defaults +{ + my $module = catfile($app, 'lib', $app, 'Model', 'MyCart.pm'); + $helper->mk_component($app, 'model', 'MyCart', 'Handel::Cart'); + file_exists_ok($module); + file_contents_like($module, qr/\['', '', ''\]/); +}; + + +## load it up +{ + my $lib = catfile(cwd, $app, 'lib'); + eval "use lib '$lib';use $app\:\:Model\:\:Cart"; + ok(!$@, 'loaded new class'); +}; t/catalyst_helpers_model_cart.t @@ -2,15 +2,21 @@ # $Id$ use strict; use warnings; -use Test::More; -use Cwd; -use File::Path; -use File::Spec::Functions; BEGIN { - eval 'use Catalyst 5.56'; + use lib 't/lib'; + use Handel::Test; + use Cwd; + use File::Path; + use File::Spec::Functions; + + eval 'use Catalyst 5.7001'; + plan(skip_all => + 'Catalyst 5.7001 not installed') if $@; + + eval 'use Catalyst::Devel 1.0'; plan(skip_all => - 'Catalyst 5.56 not installed') if $@; + 'Catalyst::Devel 1.0 not installed') if $@; eval 'use Test::File 1.10'; plan(skip_all => @@ -20,20 +26,24 @@ BEGIN { plan(skip_all => 'Test::File::Contents 0.02 not installed') if $@; - plan tests => 5; + plan tests => 8; use_ok('Catalyst::Helper'); }; -my $helper = Catalyst::Helper->new({short => 1}); +my $helper = Catalyst::Helper->new; my $app = 'TestApp'; +## setup var +chdir('t'); +mkdir('var') unless -d 'var'; +chdir('var'); + + ## create the test app { - chdir('t'); - rmtree('TestApp'); - + rmtree($app); $helper->mk_app($app); $FindBin::Bin = catdir(cwd, $app, 'lib'); }; @@ -41,10 +51,27 @@ my $app = 'TestApp'; ## create the default model { - my $module = catfile($app, 'lib', $app, 'M', 'Order.pm'); - $helper->mk_component($app, 'model', 'Order', 'Handel::Cart', 'testdsn', 'testuser', 'testpass'); + my $module = catfile($app, 'lib', $app, 'Model', 'Order.pm'); + $helper->mk_component($app, 'model', 'Order', 'Handel::Order', 'testdsn', 'testuser', 'testpass'); file_exists_ok($module); file_contents_like($module, qr/'testdsn'/); file_contents_like($module, qr/'testuser'/); file_contents_like($module, qr/'testpass'/); }; + + +## create the default model without defaults +{ + my $module = catfile($app, 'lib', $app, 'Model', 'MyOrder.pm'); + $helper->mk_component($app, 'model', 'MyOrder', 'Handel::Order'); + file_exists_ok($module); + file_contents_like($module, qr/\['', '', ''\]/); +}; + + +## load it up +{ + my $lib = catfile(cwd, $app, 'lib'); + eval "use lib '$lib';use $app\:\:Model\:\:Order"; + ok(!$@, 'loaded new class'); +}; t/catalyst_helpers_model_order.t @@ -2,29 +2,31 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 199; + plan tests => 220; }; use_ok('Handel::Checkout'); use_ok('Handel::Cart'); use_ok('Handel::Subclassing::Cart'); use_ok('Handel::Subclassing::CartOnly'); - use_ok('Handel::Constants', qw(:order :returnas)); + use_ok('Handel::Constants', qw(:order)); use_ok('Handel::Exception', ':try'); use_ok('Handel::Order'); }; ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Cart', 'Handel::Cart::Item', 1); &run('Handel::Subclassing::CartOnly', 'Handel::Cart::Item', 2); &run('Handel::Subclassing::Cart', 'Handel::Subclassing::CartItem', 3); @@ -32,49 +34,51 @@ BEGIN { sub run { my ($subclass, $itemclass, $dbsuffix) = @_; + Handel::Test->clear_schema($schema); + local $ENV{'HandelDBIDSN'} = $schema->dsn; - ## Setup SQLite DB for tests - { - my $dbfile = "t/checkout_cart_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $createcart = 't/sql/cart_create_table.sql'; - my $createorder = 't/sql/order_create_table.sql'; - - unlink $dbfile; - executesql($db, $createorder); - executesql($db, $createcart); - local $^W = 0; - Handel::DBI->connection($db); + ## do nothing with nothing + { + my $checkout = Handel::Checkout->new; + is($checkout->cart, undef, 'has no cart'); + is($checkout->cart(0), undef, 'do nothing'); + is($checkout->cart, undef, 'has no cart'); }; ## test for Handel::Exception::Argument where first param is not a hashref + ## now tests for order not found since constraint_uuid is gone for subclassing { try { + local $ENV{'LANG'} = 'en'; my $checkout = Handel::Checkout->new; $checkout->cart('1234'); - fail; - } catch Handel::Exception::Argument with { - pass; + fail('no exception thrown'); + } catch Handel::Exception::Order with { + pass('caught order exception'); + like(shift, qr/not find a cart/i, 'not find a cart in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; ## test for Handel::Exception::Argument where cart option is not a hashref + ## now tests for order not found since constraint_uuid is gone for subclassing { try { + local $ENV{'LANG'} = 'en'; my $checkout = Handel::Checkout->new({cart => '1234'}); - fail; - } catch Handel::Exception::Argument with { - pass; + fail('no exception thrown'); + } catch Handel::Exception::Order with { + pass('caught order exception'); + like(shift, qr/not find a cart/i, 'not find a cart in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -82,15 +86,17 @@ sub run { ## test for Handel::Exception::Argument where cart object is not a Handel::Cart object { try { + local $ENV{'LANG'} = 'en'; my $checkout = Handel::Checkout->new; my $fake = bless {}, 'MyObject::Foo'; $checkout->cart($fake); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*Handel::Cart/i, 'not cart object in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -98,21 +104,27 @@ sub run { ## test for Handel::Exception::Argument where cart option object is not a Handel::Cart object { try { + local $ENV{'LANG'} = 'en'; my $fake = bless {}, 'MyObject::Foo'; my $checkout = Handel::Checkout->new({cart => $fake}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*Handel::Cart/i, 'not cart object in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; { ## create and order from a cart id - my $cart = $subclass->new({id=>'66BFFD29-8FAD-4200-A22F-E0D80979ADBF', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'66BFFD29-8FAD-4200-A22F-E0D80979ADBF', + shopper=>'66BFFD29-8FAD-4200-A22F-E0D80979ADBF', + name=>'My First Cart' + }); my $item = $cart->add({ id => '5A8E0C3D-92C3-49b1-A988-585C792B7529', sku => 'sku1', @@ -126,23 +138,27 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'has same item count'); + is($order->subtotal, $cart->subtotal, 'has same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; { ## create and order from a cart id object as new option - my $cart = $subclass->new({id=>'7B029717-08CC-414d-B3EA-680A5B8BC12C', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'7B029717-08CC-414d-B3EA-680A5B8BC12C', + shopper=>'7B029717-08CC-414d-B3EA-680A5B8BC12C', + name=>'My First Cart' + }); my $item = $cart->add({ id => 'AF8F39D9-D958-4ddf-A688-433DB4B62835', sku => 'sku1', @@ -155,23 +171,27 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'same count'); + is($order->subtotal, $cart->subtotal, 'same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; { ## create and order from a Handel::Cart object - my $cart = $subclass->new({id=>'989935CD-5131-4f50-9D6A-F2192468A817', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'989935CD-5131-4f50-9D6A-F2192468A817', + shopper=>'989935CD-5131-4f50-9D6A-F2192468A817', + name=>'My First Cart' + }); my $item = $cart->add({ id => 'A262096F-E4A7-4c1b-8BAC-01114C68F8FA', sku => 'sku1', @@ -185,23 +205,27 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'same count'); + is($order->subtotal, $cart->subtotal, 'same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; { ## create and order from a Handel::Cart object as new option - my $cart = $subclass->new({id=>'A16A5F16-840D-42d2-B414-39E745326552', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'A16A5F16-840D-42d2-B414-39E745326552', + shopper=>'A16A5F16-840D-42d2-B414-39E745326552', + name=>'My First Cart' + }); my $item = $cart->add({ id => '91F44BE8-F4DD-47e5-859F-884160B96A0B', sku => 'sku1', @@ -214,23 +238,27 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'same count'); + is($order->subtotal, $cart->subtotal, 'same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; { ## create and order from a HASH filter - my $cart = $subclass->new({id=>'D8FD6757-4D8C-4b60-A1AA-AD9D4270480B', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'D8FD6757-4D8C-4b60-A1AA-AD9D4270480B', + shopper=>'D8FD6757-4D8C-4b60-A1AA-AD9D4270480B', + name=>'My First Cart' + }); my $item = $cart->add({ id => '67F4056F-8AC1-4810-96E2-57E1A5BE5DE3', sku => 'sku1', @@ -244,23 +272,27 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'same count'); + is($order->subtotal, $cart->subtotal, 'same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; { ## create and order from a HASH filter as a new option - my $cart = $subclass->new({id=>'255EE4F0-8CB0-42ed-8853-94AB47BDF14E', name=>'My First Cart'}); + my $cart = $subclass->create({ + id=>'255EE4F0-8CB0-42ed-8853-94AB47BDF14E', + shopper=>'255EE4F0-8CB0-42ed-8853-94AB47BDF14E', + name=>'My First Cart' + }); my $item = $cart->add({ id => 'D399FE0A-87A0-4162-B552-6F161D671684', sku => 'sku1', @@ -273,17 +305,17 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); - is($order->count, $cart->count); - is($order->subtotal, $cart->subtotal); + is($order->count, $cart->count, 'same count'); + is($order->subtotal, $cart->subtotal, 'same subtotal'); - my $orderitem = $order->items; + my $orderitem = $order->items->first; isa_ok($orderitem, 'Handel::Order::Item'); - is($orderitem->sku, $item->sku); - is($orderitem->quantity, $item->quantity); - is($orderitem->price, $item->price); - is($orderitem->description, $item->description); - is($orderitem->total, $item->total); - is($orderitem->orderid, $order->id); + is($orderitem->sku, $item->sku, 'same sku'); + is($orderitem->quantity, $item->quantity, 'same quantity'); + is($orderitem->price, $item->price, 'same price'); + is($orderitem->description, $item->description, 'same description'); + is($orderitem->total, $item->total, 'same total'); + is($orderitem->orderid, $order->id, 'same id'); }; }; t/checkout_cart.t @@ -2,16 +2,17 @@ # $Id$ use strict; use warnings; -use Test::More tests => 131; -use lib 't/lib'; -use Handel::Checkout::TestMessage; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 180; + use_ok('Handel::Checkout'); use_ok('Handel::Subclassing::Checkout'); use_ok('Handel::Subclassing::CheckoutStash'); use_ok('Handel::Subclassing::Stash'); use_ok('Handel::Exception', ':try'); + use_ok('Handel::Checkout::TestMessage'); }; @@ -27,15 +28,17 @@ sub run { ## test for Handel::Exception::Argument where message is not a scalar { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new({pluginpaths => 'Handel::LOADNOTHING'}); $checkout->add_message([1, 2, 3]); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*text message/i, 'not text message in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -43,16 +46,18 @@ sub run { ## test for Handel::Exception::Argument where message is not a Handel::Checkout;:Message subclass { try { + local $ENV{'LANG'} = 'en'; my $fake = bless {}, 'FakeModule'; my $checkout = $subclass->new({pluginpaths => 'Handel::LOADNOTHING'}); $checkout->add_message($fake); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*Handel::Checkout::Message/i, 'notmessage object in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -65,8 +70,31 @@ sub run { ); isa_ok($message, 'Handel::Checkout::Message'); - is($message->text, 'My Message'); - is($message->otherproperty, 'foo'); + is($message->text, 'My Message', 'got message'); + is($message->otherproperty, 'foo', 'got other property'); + }; + + + ## add a message that isa Apache::AxKit::Exception::Error + { + my $checkout = $subclass->new({pluginpaths => 'Handel::LOADNOTHING'}); + my $axkitmessage = bless {text => 'Foo'}, 'Apache::AxKit::Exception::Error'; + + $checkout->add_message($axkitmessage); + + my @messages = @{$checkout->messages}; + is(scalar @messages, 1, 'have 1 message'); + + my $message = $messages[0]; + isa_ok($message, 'Handel::Checkout::Message'); + is($messages[0]->text . '', 'Foo', 'got message text'); + + ok($message->filename, 'has filename'); + ok($message->line, 'has line'); + + $checkout->clear_messages; + @messages = @{$checkout->messages}; + is(scalar @messages, 0, 'has 0 messages'); }; @@ -77,37 +105,61 @@ sub run { $checkout->add_message('This is a message'); my @messages = @{$checkout->messages}; - is(scalar @messages, 1); + is(scalar @messages, 1, 'have 1 message'); my $message = $messages[0]; isa_ok($message, 'Handel::Checkout::Message'); - is($messages[0]->text, 'This is a message'); + is($messages[0]->text, 'This is a message', 'got text'); - ok($message->filename); - ok($message->line); + ok($message->filename, 'has filename'); + ok($message->line, 'has line'); $checkout->clear_messages; @messages = @{$checkout->messages}; - is(scalar @messages, 0); + is(scalar @messages, 0, 'has no messsages'); }; ## add a message using Handel::Checkout::Message object { my $checkout = $subclass->new({pluginpaths => 'Handel::LOADNOTHING'}); + my $newmessage = Handel::Checkout::Message->new( + text => 'This is a new message', + package => 'package', + filename => 'filename', + line => 'line' + ); + + $checkout->add_message($newmessage); + + my @messages = @{$checkout->messages}; + is(scalar @messages, 1, 'has 1 message'); + + my $message = $messages[0]; + isa_ok($message, 'Handel::Checkout::Message'); + is($messages[0]->text, 'This is a new message', 'has text message'); + is($messages[0]->package, 'package', 'has package'); + is($messages[0]->filename, 'filename', 'has filename'); + is($messages[0]->line, 'line', 'has line'); + }; + + + ## add a message using Handel::Checkout::Message object with existing package/file/line + { + my $checkout = $subclass->new({pluginpaths => 'Handel::LOADNOTHING'}); my $newmessage = Handel::Checkout::Message->new(text => 'This is a new message'); $checkout->add_message($newmessage); my @messages = @{$checkout->messages}; - is(scalar @messages, 1); + is(scalar @messages, 1, 'has 1 message'); my $message = $messages[0]; isa_ok($message, 'Handel::Checkout::Message'); - is($messages[0]->text, 'This is a new message'); + is($messages[0]->text, 'This is a new message', 'has message text'); - ok($message->filename); - ok($message->line); + ok($message->filename, 'has filename'); + ok($message->line, 'has line'); }; @@ -119,14 +171,19 @@ sub run { $checkout->add_message($newmessage); my @messages = @{$checkout->messages}; - is(scalar @messages, 1); + is(scalar @messages, 1, 'has 1 message'); my $message = $messages[0]; isa_ok($message, 'Handel::Checkout::Message'); - is($messages[0]->text, 'This is a new message'); + is($messages[0]->text, 'This is a new message', 'has message text'); + + ok($message->filename, 'has filename'); + ok($message->line, 'has line'); - ok($message->filename); - ok($message->line); + is("$message", 'This is a new message', 'message stringifies to message text'); + + $message->{'text'} = undef; + is("$message", ref $message, 'message stringifies to object in lue of text'); }; @@ -138,32 +195,42 @@ sub run { $checkout->add_message('Message2'); my @messages = @{$checkout->messages}; - is(scalar @messages, 2); + is(scalar @messages, 2, 'has 2 messages'); isa_ok($messages[0], 'Handel::Checkout::Message'); - is($messages[0]->text, 'Message1'); - is($messages[0], 'Message1'); - ok($messages[0]->filename); - ok($messages[0]->line); + is($messages[0]->text, 'Message1', 'has message text'); + is($messages[0], 'Message1', 'has message text'); + ok($messages[0]->filename, 'has filename'); + ok($messages[0]->line, 'has line'); isa_ok($messages[1], 'Handel::Checkout::Message'); - is($messages[1]->text, 'Message2'); - is($messages[1], 'Message2'); - ok($messages[1]->filename); - ok($messages[1]->line); + is($messages[1]->text, 'Message2', 'has message text'); + is($messages[1], 'Message2', 'has message text'); + ok($messages[1]->filename, 'has filename'); + ok($messages[1]->line, 'has line'); my $messagesref = $checkout->messages; isa_ok($messagesref, 'ARRAY'); isa_ok($messagesref->[0], 'Handel::Checkout::Message'); - is($messagesref->[0]->text, 'Message1'); - is($messagesref->[0], 'Message1'); - ok($messagesref->[0]->filename); - ok($messagesref->[0]->line); - - is($messagesref->[1]->text, 'Message2'); - is($messagesref->[1], 'Message2'); - ok($messagesref->[1]->filename); - ok($messagesref->[1]->line); + is($messagesref->[0]->text, 'Message1', 'has message text'); + is($messagesref->[0], 'Message1', 'has message text'); + ok($messagesref->[0]->filename, 'has filename'); + ok($messagesref->[0]->line, 'has line'); + + is($messagesref->[1]->text, 'Message2', 'has message text'); + is($messagesref->[1], 'Message2', 'has message text'); + ok($messagesref->[1]->filename, 'has filename'); + ok($messagesref->[1]->line, 'has line'); }; }; + + +package Apache::AxKit::Exception::Error; +use strict; +use warnings; +use overload + '""' => sub{shift->{'text'}}, + fallback => 1; + +1; t/checkout_messages.t @@ -2,20 +2,20 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 126; + plan tests => 143; }; use_ok('Handel::Checkout'); - use_ok('Handel::Constants', qw(:order :returnas)); + use_ok('Handel::Constants', qw(:order)); use_ok('Handel::Exception', ':try'); use_ok('Handel::Order'); use_ok('Handel::Subclassing::Order'); @@ -23,7 +23,35 @@ BEGIN { }; +## throw exception when setting a bogus order class +{ + try { + local $ENV{'LANG'} = 'en'; + Handel::Checkout->order_class('Funklebean'); + + fail('no exception thrown'); + } catch Handel::Exception::Checkout with { + pass('caught Handel::Exception::Checkout'); + like(shift, qr/could not be loaded/i, 'not loaded in message'); + } otherwise { + fail('failed to catch Handel::Exception'); + }; +}; + + +## unset something altogether +{ + is(Handel::Checkout->order_class, 'Handel::Order', 'order class is set'); + Handel::Checkout->order_class(undef); + is(Handel::Checkout->order_class, undef, 'order class is unset'); + Handel::Checkout->order_class('Handel::Order'); + is(Handel::Checkout->order_class, 'Handel::Order', 'order class is reset'); +}; + + ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Checkout', 'Handel::Order', 1); &run('Handel::Checkout', 'Handel::Subclassing::Order', 2); &run('Handel::Checkout', 'Handel::Subclassing::OrderOnly', 3); @@ -31,49 +59,42 @@ BEGIN { sub run { my ($subclass, $orderclass, $dbsuffix) = @_; - $subclass->order_class($orderclass); - - ## Setup SQLite DB for tests - { - my $dbfile = "t/checkout_order_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $create = 't/sql/order_create_table.sql'; - my $data = 't/sql/order_fake_data.sql'; - - unlink $dbfile; - executesql($db, $create); - executesql($db, $data); + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; - local $^W = 0; - Handel::DBI->connection($db); - }; + $subclass->order_class($orderclass); - ## test for Handel::Exception::Argument where first param is not a hashref + ## test for Handel::Exception::Checkout when no order can be found as a string { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; - $checkout->order('1234'); - fail; - } catch Handel::Exception::Argument with { - pass; + fail('no exception thrown'); + } catch Handel::Exception::Checkout with { + pass('caught checkout exception'); + like(shift, qr/not find an order/i, 'not find order in message'); } otherwise { - fail; + fail('other exception caught'); }; }; - ## test for Handel::Exception::Argument where order option is not a hashref + ## test for Handel::Exception::Chckout when no order is found as hash { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new({order => '1234'}); - fail; - } catch Handel::Exception::Argument with { - pass; + ok(!$checkout->order, 'no order set'); + + fail('no exception thrown'); + } catch Handel::Exception::Checkout with { + pass('caught argument exception'); + like(shift, qr/not find an order/i, 'not find order in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -81,15 +102,17 @@ sub run { ## test for Handel::Exception::Argument where order object is not a Handel::Order object { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; my $fake = bless {}, 'MyObject::Foo'; $checkout->order($fake); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*Handel::Order/i, 'not order object in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -97,14 +120,16 @@ sub run { ## test for Handel::Exception::Argument where order option object is not a Handel::Order object { try { + local $ENV{'LANG'} = 'en'; my $fake = bless {}, 'MyObject::Foo'; my $checkout = $subclass->new({order => $fake}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not.*Handel::Order/i, 'not order object in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -118,10 +143,10 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); isa_ok($order, $orderclass); - is($order->id, '11111111-1111-1111-1111-111111111111'); - is($order->shopper, '11111111-1111-1111-1111-111111111111'); - is($order->type, ORDER_TYPE_TEMP); - is($order->count, 2); + is($order->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($order->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($order->type, ORDER_TYPE_TEMP, 'got temp type'); + is($order->count, 2, 'has 2 items'); }; @@ -131,10 +156,10 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); isa_ok($order, $orderclass); - is($order->id, '11111111-1111-1111-1111-111111111111'); - is($order->shopper, '11111111-1111-1111-1111-111111111111'); - is($order->type, ORDER_TYPE_TEMP); - is($order->count, 2); + is($order->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($order->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($order->type, ORDER_TYPE_TEMP, 'got temp type'); + is($order->count, 2, 'has 2 items'); }; @@ -150,10 +175,10 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); isa_ok($order, $orderclass); - is($order->id, '11111111-1111-1111-1111-111111111111'); - is($order->shopper, '11111111-1111-1111-1111-111111111111'); - is($order->type, ORDER_TYPE_TEMP); - is($order->count, 2); + is($order->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($order->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($order->type, ORDER_TYPE_TEMP, 'got temp type'); + is($order->count, 2, 'has 2 items'); }; @@ -167,19 +192,19 @@ sub run { my $order = $checkout->order; isa_ok($order, 'Handel::Order'); isa_ok($order, $orderclass); - is($order->id, '11111111-1111-1111-1111-111111111111'); - is($order->shopper, '11111111-1111-1111-1111-111111111111'); - is($order->type, ORDER_TYPE_TEMP); - is($order->count, 2); + is($order->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($order->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($order->type, ORDER_TYPE_TEMP, 'got temp type'); + is($order->count, 2, 'has 2 items'); }; ## assign the order using a Handel::Order object { - my $order = $orderclass->load({ + my $order = $orderclass->search({ id => '11111111-1111-1111-1111-111111111111', type => ORDER_TYPE_TEMP - }); + })->first; my $checkout = $subclass->new; $checkout->order($order); @@ -187,28 +212,28 @@ sub run { my $loadedorder = $checkout->order; isa_ok($loadedorder, 'Handel::Order'); isa_ok($loadedorder, $orderclass); - is($loadedorder->id, '11111111-1111-1111-1111-111111111111'); - is($loadedorder->shopper, '11111111-1111-1111-1111-111111111111'); - is($loadedorder->type, ORDER_TYPE_TEMP); - is($loadedorder->count, 2); + is($loadedorder->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($loadedorder->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($loadedorder->type, ORDER_TYPE_TEMP, 'got temp type'); + is($loadedorder->count, 2, 'has 2 items'); }; ## assign the order using a Handel::Order object as a new option { - my $order = $orderclass->load({ + my $order = $orderclass->search({ id => '11111111-1111-1111-1111-111111111111', type => ORDER_TYPE_TEMP - }); + })->first; my $checkout = $subclass->new({order => $order}); my $loadedorder = $checkout->order; isa_ok($loadedorder, 'Handel::Order'); isa_ok($loadedorder, $orderclass); - is($loadedorder->id, '11111111-1111-1111-1111-111111111111'); - is($loadedorder->shopper, '11111111-1111-1111-1111-111111111111'); - is($loadedorder->type, ORDER_TYPE_TEMP); - is($loadedorder->count, 2); + is($loadedorder->id, '11111111-1111-1111-1111-111111111111', 'got order id'); + is($loadedorder->shopper, '11111111-1111-1111-1111-111111111111', 'got shopper id'); + is($loadedorder->type, ORDER_TYPE_TEMP, 'got temp type'); + is($loadedorder->count, 2, 'has 2 items'); }; }; t/checkout_order.t @@ -2,11 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More tests => 123; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test tests => 141; + use_ok('Handel::Checkout'); use_ok('Handel::Subclassing::Checkout'); use_ok('Handel::Subclassing::CheckoutStash'); @@ -16,6 +16,15 @@ BEGIN { }; +## add a phase and import +{ + is(main->can('NEWPHASE'), undef, 'new phase does not exists'); + Handel::Checkout->add_phase('NEWPHASE', 23, 1); + can_ok('main', 'NEWPHASE'); + is(&main::NEWPHASE, 23, 'new phase in place'); +}; + + ## This is a hack, but it works. :-) &run('Handel::Checkout'); &run('Handel::Subclassing::Checkout'); @@ -29,15 +38,17 @@ sub run { ## than an array reference { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; $checkout->phases({'1234' => 1}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not an array/i, 'not array in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -47,13 +58,15 @@ sub run { ## than an array reference in news' phases option { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new({phases => {'1234' => 1}}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not an array/i, 'not array in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -61,13 +74,15 @@ sub run { ## Test for Handel::Exception::Constraint if new constant name already exists { try { + local $ENV{'LANG'} = 'en'; $subclass->add_phase('CHECKOUT_PHASE_INITIALIZE', 99); - fail; + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/already exists/i, 'already exists in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -75,13 +90,15 @@ sub run { ## Test for Handel::Exception::Constraint if new constant value already exists { try { + local $ENV{'LANG'} = 'en'; $subclass->add_phase('CUSTOM_CHECKOUT_PHASE', CHECKOUT_PHASE_INITIALIZE); - fail; + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/already exists/i, 'already exists in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -90,13 +107,15 @@ sub run { sub CUSTOM_CHECKOUT_PHASE_TEST {}; { try { + local $ENV{'LANG'} = 'en'; $subclass->add_phase('CUSTOM_CHECKOUT_PHASE_TEST', 43, 1); - fail; + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/already exists/i, 'already exists in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -109,8 +128,8 @@ sub run { my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 1); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); + is(scalar @{$phases}, 1, 'has 1 phase'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); }; @@ -119,8 +138,8 @@ sub run { my $checkout = $subclass->new({phases => [CHECKOUT_PHASE_DELIVER]}); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 1); - is($phases->[0], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 1, 'has 1 phase'); + is($phases->[0], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; @@ -128,11 +147,11 @@ sub run { { my $checkout = $subclass->new; my @phases = $checkout->phases; - ok(scalar @phases >= 1); + ok(scalar @phases >= 1, 'has phases'); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - ok(scalar @{$phases} >= 1); + ok(scalar @{$phases} >= 1, 'has more than one phase'); }; @@ -140,11 +159,11 @@ sub run { { my $checkout = $subclass->new({phases => [CHECKOUT_PHASE_DELIVER, CHECKOUT_PHASE_INITIALIZE]}); my @phases = $checkout->phases; - is(scalar @phases, 2); + is(scalar @phases, 2, 'has 2 phases'); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 2); + is(scalar @{$phases}, 2, 'has 2 phases'); }; @@ -156,8 +175,8 @@ sub run { my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 1); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); + is(scalar @{$phases}, 1, 'has 1 phase'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); }; @@ -169,9 +188,9 @@ sub run { my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 2); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); - is($phases->[1], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 2, 'has 2 phases'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); + is($phases->[1], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; @@ -183,9 +202,9 @@ sub run { my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 2); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); - is($phases->[1], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 2, 'has 2 phases'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); + is($phases->[1], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; @@ -194,34 +213,32 @@ sub run { my $checkout = $subclass->new({phases => 'CHECKOUT_PHASE_DELIVER'}); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 1); - is($phases->[0], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 1, 'has 1 phase'); + is($phases->[0], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; ## Set the phases using news' phases option as comma seperated string and make ## sure they stick { - my $checkout = $subclass->new({phases => 'CHECKOUT_PHASE_AUTHORIZE, - CHECKOUT_PHASE_DELIVER'}); + my $checkout = $subclass->new({phases => 'CHECKOUT_PHASE_AUTHORIZE, CHECKOUT_PHASE_DELIVER'}); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 2); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); - is($phases->[1], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 2, 'has 2 phases'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); + is($phases->[1], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; ## Set the phases using news' space option as comma seperated string and make ## sure they stick { - my $checkout = $subclass->new({phases => 'CHECKOUT_PHASE_AUTHORIZE - CHECKOUT_PHASE_DELIVER'}); + my $checkout = $subclass->new({phases => 'CHECKOUT_PHASE_AUTHORIZE CHECKOUT_PHASE_DELIVER'}); my $phases = $checkout->phases; isa_ok($phases, 'ARRAY'); - is(scalar @{$phases}, 2); - is($phases->[0], CHECKOUT_PHASE_AUTHORIZE); - is($phases->[1], CHECKOUT_PHASE_DELIVER); + is(scalar @{$phases}, 2, 'has 2 phases'); + is($phases->[0], CHECKOUT_PHASE_AUTHORIZE, 'authorize set'); + is($phases->[1], CHECKOUT_PHASE_DELIVER, 'deliver set'); }; }; t/checkout_phases.t @@ -2,11 +2,13 @@ # $Id$ use strict; use warnings; -use lib 't/lib'; -use Test::More tests => 1257; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 1275; + use_ok('Handel::Checkout'); + use_ok('Handel::Checkout::Plugin'); use_ok('Handel::Subclassing::Checkout'); use_ok('Handel::Subclassing::CheckoutStash'); use_ok('Handel::Subclassing::Stash'); @@ -15,6 +17,53 @@ BEGIN { }; +## make sure no path returns no path +is(Handel::Checkout::_path_to_array(''), '', 'path to array returns nothing for nothing'); + + + +## name returns class name, others do nothing +{ + my $plugin = Handel::Checkout::Plugin->new; + isa_ok($plugin, 'Handel::Checkout::Plugin'); + is($plugin->name, 'Handel::Checkout::Plugin', 'name returns class name'); + is(Handel::Checkout::Plugin->name, 'Handel::Checkout::Plugin', 'name returns class name'); + is(Handel::Checkout::Plugin::name, undef, 'function returns nothing'); + + is(Handel::Checkout::Plugin->setup, undef, 'setup does nothing'); + is(Handel::Checkout::Plugin->teardown, undef, 'teardown does nothing'); + + { + my $warning; + local $SIG{'__WARN__'} = sub { + $warning = shift; + }; + is(Handel::Checkout::Plugin->register, undef, 'register does nothing'); + like($warning, qr/plugin .* defined register/i, 'warning was set'); + }; +}; + + +## test for exception when adding the same phase, preference +{ + my $checkout = Handel::Checkout->new({pluginpaths => 'Handel::LOADNOTHING'}); + $checkout->{'plugins'} = [bless {}, 'main']; + $checkout->add_handler(CHECKOUT_PHASE_INITIALIZE, sub{}, 350); + + try { + local $ENV{'LANG'} = 'en'; + $checkout->add_handler(CHECKOUT_PHASE_INITIALIZE, sub{}, 350); + + fail('no exception thrown'); + } catch Handel::Exception::Checkout with { + pass('caught checkout exception'); + like(shift, qr/already a handler/i, 'phase exists in message'); + } otherwise { + fail('other exception thrown'); + }; +}; + + ## This is a hack, but it works. :-) &run('Handel::Checkout'); &run('Handel::Subclassing::Checkout'); @@ -27,15 +76,17 @@ sub run { ## test for Handel::Exception::Argument on bad add_handler phase { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; $checkout->add_handler(42, sub{}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a valid checkout_phase/i, 'phase not found in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -43,15 +94,17 @@ sub run { ## test for Handel::Exception::Argument on bad CODE reference { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; $checkout->add_handler(CHECKOUT_PHASE_INITIALIZE, 'foo'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not a code/i, 'not a code in message'); } otherwise { - fail; + fail('other exception thrown'); }; }; @@ -59,6 +112,8 @@ sub run { ## Add a custom phase and verify it works in add_handler { try { + local $ENV{'LANG'} = 'en'; + #clean out the new constant between subclass runs { no warnings; @@ -71,10 +126,9 @@ sub run { $checkout->add_handler(Handel::Constants->CHECKOUT_PHASE_CUSTOM, sub{}); - pass; + pass('added custom phase'); } otherwise { - warn shift; - fail; + fail('other exception thrown'); }; }; @@ -86,21 +140,21 @@ sub run { my $checkout = $subclass->new; my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin exists'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); my $plugin = $plugins{'Handel::TestPlugins::First'}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init was called'); + ok($plugin->{'register_called'}, 'register was called'); isa_ok($checkout->{'handlers'}->{1}->{1}->[0], 'Handel::TestPlugins::First'); - is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE'); + is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE', 'stored code ref'); $checkout->{'handlers'}->{1}->{1}->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); }; @@ -109,21 +163,21 @@ sub run { my $checkout = $subclass->new({pluginpaths => 'Handel::TestPlugins'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); my $plugin = $plugins{'Handel::TestPlugins::First'}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init was called'); + ok($plugin->{'register_called'}, 'register was called'); isa_ok($checkout->{'handlers'}->{1}->{1}->[0], 'Handel::TestPlugins::First'); - is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE'); + is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE', 'registered code ref'); $checkout->{'handlers'}->{1}->{1}->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); }; @@ -132,21 +186,21 @@ sub run { my $checkout = $subclass->new({pluginpaths => ['Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); my $plugin = $plugins{'Handel::TestPlugins::First'}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); isa_ok($checkout->{'handlers'}->{1}->{1}->[0], 'Handel::TestPlugins::First'); - is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE'); + is(ref $checkout->{'handlers'}->{1}->{1}->[1], 'CODE', 'has code ref'); $checkout->{'handlers'}->{1}->{1}->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); }; @@ -157,26 +211,26 @@ sub run { my $checkout = $subclass->new; my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -190,26 +244,26 @@ sub run { my $checkout = $subclass->new({pluginpaths => 'Handel::TestPlugins Handel::OtherTestPlugins'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -223,26 +277,26 @@ sub run { my $checkout = $subclass->new({pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -256,26 +310,26 @@ sub run { my $checkout = $subclass->new({pluginpaths => ['Handel::TestPlugins', 'Handel::OtherTestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -292,26 +346,26 @@ sub run { my $checkout = $subclass->new({pluginpaths => ['Handel::TestPlugins', 'Handel::OtherTestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -327,26 +381,26 @@ sub run { my $checkout = $subclass->new; my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 2, 'loaded 2 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -362,26 +416,26 @@ sub run { my $checkout = $subclass->new; my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 3); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 3, 'loaded 3 plugins'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First Handel::OtherTestPlugins::Second Handel::Checkout::Plugin::TestPlugin)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -397,26 +451,26 @@ sub run { my $checkout = $subclass->new; my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second Handel::Checkout::Plugin::TestPlugin)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -430,26 +484,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => 'Handel::OtherTestPlugins'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second Handel::Checkout::Plugin::TestPlugin)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -463,26 +517,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second Handel::Checkout::Plugin::TestPlugin)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -498,26 +552,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 3); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 3, 'loaded at least 3 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -533,26 +587,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -568,26 +622,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -603,26 +657,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -636,26 +690,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], ignoreplugins => ['Handel::OtherTestPlugins::Second']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -669,26 +723,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], ignoreplugins => 'Handel::OtherTestPlugins::Second'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -702,26 +756,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], ignoreplugins => qr/^Handel::OtherTestPlugins::Second$/}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - ok(scalar keys %plugins >= 2); - ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + ok(scalar keys %plugins >= 2, 'loaded at least 2 plugins'); + ok(exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin loaded'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'first plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::Checkout::Plugin::TestPlugin Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -737,26 +791,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'init_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -772,26 +826,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'hase code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -807,26 +861,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'fist plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -840,26 +894,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], loadplugins => ['Handel::OtherTestPlugins::Second']}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -873,26 +927,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], loadplugins => 'Handel::OtherTestPlugins::Second'}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -906,26 +960,26 @@ sub run { my $checkout = $subclass->new({addpluginpaths => ['Handel::OtherTestPlugins', 'Handel::TestPlugins'], loadplugins => qr/^Handel::OtherTestPlugins::Second$/}); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::OtherTestPlugins::Second'}, 'second plugin loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::TestPlugins::First'}, 'first plugin no loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::OtherTestPlugins::Second)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -942,26 +996,26 @@ sub run { }); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 1); - ok(exists $plugins{'Handel::TestPlugins::First'}); - ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}); - ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}); + is(scalar keys %plugins, 1, 'loaded 1 plugin'); + ok(exists $plugins{'Handel::TestPlugins::First'}, 'fist plugin loaded'); + ok(!exists $plugins{'Handel::OtherTestPlugins::Second'}, 'other plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestPlugin'}, 'test plugin not loaded'); + ok(!exists $plugins{'Handel::Checkout::Plugin::TestBogusPlugin'}, 'bogus plugin not loaded'); foreach (qw(Handel::TestPlugins::First)) { my $package = $_; my $plugin = $plugins{$package}; isa_ok($plugin, 'Handel::Checkout::Plugin'); - ok($plugin->{'init_called'}); - ok($plugin->{'register_called'}); + ok($plugin->{'init_called'}, 'init called'); + ok($plugin->{'register_called'}, 'register called'); foreach (values %{$checkout->{'handlers'}->{1}}) { if (ref $_->[0] eq $package) { isa_ok($_->[0], $package); - is(ref $_->[1], 'CODE'); + is(ref $_->[1], 'CODE', 'has code ref'); $_->[1]->($plugin); - ok($plugin->{'handler_called'}); + ok($plugin->{'handler_called'}, 'handler called'); last; }; @@ -979,11 +1033,10 @@ sub run { }); my @plugins = $checkout->plugins; - is(scalar @plugins, 2); + is(scalar @plugins, 2, 'loaded 2 plugins'); my $plugins = $checkout->plugins; isa_ok($plugins, 'ARRAY'); - is(scalar @{$plugins}, 2); + is(scalar @{$plugins}, 2, 'loaded 2 plugins'); }; - }; t/checkout_plugins.t @@ -2,16 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { + use lib 't/lib'; + use Handel::Test; + eval 'require DBD::SQLite'; if($@) { plan skip_all => 'DBD::SQLite not installed'; } else { - plan tests => 92; + plan tests => 196; }; use_ok('Handel::Checkout'); @@ -19,13 +19,15 @@ BEGIN { use_ok('Handel::Subclassing::Order'); use_ok('Handel::Subclassing::CheckoutStash'); use_ok('Handel::Subclassing::Stash'); - use_ok('Handel::Constants', qw(:checkout)); + use_ok('Handel::Constants', qw(:checkout :order)); use_ok('Handel::Exception', ':try'); use_ok('Handel::Order'); }; ## This is a hack, but it works. :-) +my $schema = Handel::Test->init_schema(no_populate => 1); + &run('Handel::Checkout', 1); &run('Handel::Subclassing::Checkout', 2); &run('Handel::Subclassing::CheckoutStash', 3); @@ -33,37 +35,24 @@ BEGIN { sub run { my ($subclass, $dbsuffix) = @_; - - ## Setup SQLite DB for tests - { - my $dbfile = "t/checkout_process_$dbsuffix.db"; - my $db = "dbi:SQLite:dbname=$dbfile"; - my $createcart = 't/sql/cart_create_table.sql'; - my $createorder = 't/sql/order_create_table.sql'; - my $data = 't/sql/order_fake_data.sql'; - - unlink $dbfile; - executesql($db, $createorder); - executesql($db, $createcart); - executesql($db, $data); - - local $^W = 0; - Handel::DBI->connection($db); - }; + Handel::Test->populate_schema($schema, clear => 1); + local $ENV{'HandelDBIDSN'} = $schema->dsn; ## test for Handel::Exception::Checkout where no order is loaded { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; $checkout->process; - fail; + fail('no exception thrown'); } catch Handel::Exception::Checkout with { - pass; + pass('caught checkout exception'); + like(shift, qr/no order/i, 'no order found in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -72,14 +61,16 @@ sub run { ## or string { try { + local $ENV{'LANG'} = 'en'; my $checkout = $subclass->new; $checkout->process({'1234' => 1}); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('caught argument exception'); + like(shift, qr/not an array/i, 'not an array ref in message'); } otherwise { - fail; + fail('other exception caught'); }; }; @@ -92,19 +83,72 @@ sub run { phases => [CHECKOUT_PHASE_INITIALIZE] }); - is($checkout->process, CHECKOUT_STATUS_OK); + is($checkout->process, CHECKOUT_STATUS_OK, 'processed OK'); + + foreach ($checkout->plugins) { + ok($_->{'setup_called'}, 'setup was called'); + ok($_->{'handler_called'}, 'handler was called'); + ok($_->{'teardown_called'}, 'teardown was called'); + }; + }; + + + ## load test plugins and checkout setup/teardown using string phases + { + my $checkout = $subclass->new({ + order => '11111111-1111-1111-1111-111111111111', + pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins' + }); + + is($checkout->process('CHECKOUT_PHASE_INITIALIZE'), CHECKOUT_STATUS_OK, 'processed OK'); + + foreach ($checkout->plugins) { + ok($_->{'setup_called'}, 'setup was called'); + ok($_->{'handler_called'}, 'handler was called'); + ok($_->{'teardown_called'}, 'teardown was called'); + }; + }; + + + ## load test plugins and checkout setup/teardown using array phases + { + my $checkout = $subclass->new({ + order => '11111111-1111-1111-1111-111111111111', + pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins' + }); + + is($checkout->process([CHECKOUT_PHASE_INITIALIZE]), CHECKOUT_STATUS_OK, 'processed OK'); + + foreach ($checkout->plugins) { + ok($_->{'setup_called'}, 'setup was called'); + ok($_->{'handler_called'}, 'handler was called'); + ok($_->{'teardown_called'}, 'teardown was called'); + }; + }; + + + ## load test plugins and checkout but usin a bogus phase + { + my $checkout = $subclass->new({ + order => '11111111-1111-1111-1111-111111111111', + pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins' + }); + + is($checkout->process([0]), CHECKOUT_STATUS_OK, 'processed OK'); foreach ($checkout->plugins) { - ok($_->{'setup_called'}); - ok($_->{'handler_called'}); - ok($_->{'teardown_called'}); + ok($_->{'setup_called'}, 'setup was called'); + ok(!$_->{'handler_called'}, 'handler was called'); + ok($_->{'teardown_called'}, 'teardown was called');; }; }; ## Run a successful test pipeline { - my $order = Handel::Order->new({}); + my $order = Handel::Order->create({ + shopper => '00000000-0000-0000-0000-000000000000' + }); $order->add({ sku => 'SKU1', quantity => 1, @@ -123,21 +167,93 @@ sub run { order => $order }); - is($checkout->process, CHECKOUT_STATUS_OK); + is($checkout->process, CHECKOUT_STATUS_OK, 'processed OK'); my $items = $order->items; - is($order->subtotal, 5.55); - is($items->first->total, 1.11); - is($items->next->total, 4.44); + is($order->subtotal+0, 5.55, 'subtotal is 5.55'); + is($items->first->total+0, 1.11, 'total is 1.11'); + $items->next; + is($items->next->total+0, 4.44, 'total is 4.44'); my @messages = $checkout->messages; - is(scalar @messages, 0); + is(scalar @messages, 0, 'has no messages'); + }; + + + ## Run a successful test pipeline usin default phases + { + my $order = Handel::Order->create({ + shopper => '00000000-0000-0000-0000-000000000000' + }); + $order->add({ + sku => 'SKU1', + quantity => 1, + price => 1.11 + }); + $order->add({ + sku => 'SKU2', + quantity => 2, + price => 2.22 + }); + + my $checkout = $subclass->new({ + pluginpaths => 'Handel::TestPipeline', + loadplugins => 'Handel::TestPipeline::InitializeTotals', + order => $order + }); + is($checkout->process, CHECKOUT_STATUS_OK, 'processed OK'); + + my $items = $order->items; + is($order->subtotal+0, 0, 'subtotal is 0'); + is($items->first->total+0, 0, 'total is 0'); + $items->next; + is($items->next->total+0, 0, 'total is 0'); + + my @messages = $checkout->messages; + is(scalar @messages, 0, 'has no messages'); + }; + + + ## Run a successful test pipeline using the stock plugins + { + my $order = Handel::Order->create({ + shopper => '00000000-0000-0000-0000-000000000000' + }); + $order->add({ + sku => 'SKU1', + quantity => 1, + price => 1.11 + }); + $order->add({ + sku => 'SKU2', + quantity => 2, + price => 2.22 + }); + + is($order->type, ORDER_TYPE_TEMP, 'order is temp'); + is($order->number, undef, 'number is not set'); + + my $checkout = $subclass->new({ + phases => CHECKOUT_ALL_PHASES, + order => $order, + loadplugins => 'Handel::Checkout::Plugin::AssignOrderNumber, Handel::Checkout::Plugin::MarkOrderSaved' + }); + + is($checkout->process, CHECKOUT_STATUS_OK, 'processed OK'); + + is($checkout->order->type, ORDER_TYPE_SAVED, 'order was marked saved'); + ok($checkout->order->number, 'number was set'); + + my @messages = $checkout->messages; + is(scalar @messages, 0, 'no error messages'); }; ## Run a failing test pipeline { - my $order = Handel::Order->new({ + $subclass->order_class->_set_storage(undef); + my $order = $subclass->order_class->create({ + shopper => '00000000-0000-0000-0000-000000000000', billtofirstname => 'BillToFirstName', billtolastname => 'BillToLastName' }); @@ -161,25 +277,28 @@ sub run { order => $order }); - is($checkout->process, CHECKOUT_STATUS_ERROR); + is($checkout->process, CHECKOUT_STATUS_ERROR, 'processed ERROR'); - is($checkout->order->billtofirstname, 'BillToFirstName'); - is($checkout->order->billtolastname, 'BillToLastName'); + is($checkout->order->billtofirstname, 'BillToFirstName', 'first name unchanged'); + is($checkout->order->billtolastname, 'BillToLastName', 'last name unchanged'); my $items = $order->items; - is($order->subtotal, 0); - is($items->first->sku, 'SKU1'); - is($items->next->sku, 'SKU2'); + is($order->subtotal+0, 0, 'subtotal is 0'); + is($items->first->sku, 'SKU1', 'sku1 is unchanged'); + $items->next; + is($items->next->sku, 'SKU2', 'sku2 is unchanged'); my @messages = $checkout->messages; - is(scalar @messages, 1); - ok($messages[0] =~ /ValidateError/); + is(scalar @messages, 1, 'has 1 message'); + ok($messages[0] =~ /ValidateError/, 'message is validate error'); }; ## Check stash writes and lifetime { - my $order = Handel::Order->new({}); + my $order = Handel::Order->create({ + shopper => '00000000-0000-0000-0000-000000000000' + }); $order->add({ sku => 'SKU1', quantity => 1, @@ -199,16 +318,62 @@ sub run { order => $order }); - is($checkout->process, CHECKOUT_STATUS_OK); - is($checkout->stash->{'WriteToStash'}, 'WrittenToStash'); + is($checkout->process, CHECKOUT_STATUS_OK, 'processed OK'); + is($checkout->stash->{'WriteToStash'}, 'WrittenToStash', 'stash variable set'); my %plugins = map { ref $_ => $_ } $checkout->plugins; - is(scalar keys %plugins, 2); - ok(exists $plugins{'Handel::TestPipeline::ReadFromStash'}); - is($plugins{'Handel::TestPipeline::ReadFromStash'}->{'ReadFromStash'}, 'WrittenToStash'); + is(scalar keys %plugins, 2, 'has 2 plugins'); + ok(exists $plugins{'Handel::TestPipeline::ReadFromStash'}, 'stash plugin loaded'); + is($plugins{'Handel::TestPipeline::ReadFromStash'}->{'ReadFromStash'}, 'WrittenToStash', 'stash written to'); my @messages = $checkout->messages; - is(scalar @messages, 0); + is(scalar @messages, 0, 'has no messages'); + }; +}; + + +## Run a failing test pipeline with a rollback failure +{ + my $order = Handel::Order->create({ + shopper => '00000000-0000-0000-0000-000000000000', + billtofirstname => 'BillToFirstName', + billtolastname => 'BillToLastName' + }); + $order->add({ + sku => 'SKU1', + quantity => 1, + price => 1.11 + }); + $order->add({ + sku => 'SKU2', + quantity => 2, + price => 2.22 + }); + + my $checkout = Handel::Checkout->new({ + pluginpaths => 'Handel::TestPipeline', + loadplugins => ['Handel::TestPipeline::InitializeTotals', + 'Handel::TestPipeline::ValidateError' + ], + phases => CHECKOUT_ALL_PHASES, + order => $order + }); + + no warnings 'once'; + local *Handel::Storage::DBIC::Result::txn_rollback = sub { + die 'boom!'; }; + + try { + local $ENV{'LANG'} = 'en'; + $checkout->process; + + fail('no exception thrown'); + } catch Handel::Exception::Checkout with { + pass('Handel::Exception::Checkout caught'); + like(shift, qr/rollback/i, 'rollback in message'); + } otherwise { + fail('other exception caught'); + }; }; t/checkout_process.t @@ -2,22 +2,16 @@ # $Id$ use strict; use warnings; -use Test::More; -use lib 't/lib'; -use Handel::TestHelper qw(executesql); BEGIN { - eval 'require DBD::SQLite'; - if($@) { - plan skip_all => 'DBD::SQLite not installed'; - } else { - plan tests => 19; - }; + use lib 't/lib'; + use Handel::Test tests => 31; use_ok('Handel::Checkout'); use_ok('Handel::Subclassing::Checkout'); use_ok('Handel::Subclassing::CheckoutStash'); use_ok('Handel::Subclassing::Stash'); + use_ok('Handel::Exception', ':try'); }; @@ -32,20 +26,29 @@ sub run { ## Check the default stash creation { - my $checkout = $subclass->new; + my $checkout = $subclass->new({ + stash => {foo => 'bar'} + }); isa_ok($checkout->stash, $stashclass); + is($checkout->stash->{'foo'}, 'bar', 'stash item is set'); }; ## Check the stash parameter { - my $stash = CustomStash->new; + my $stash = CustomStash->new({ + foo => 'bar' + }); my $checkout = Handel::Checkout->new({ stash => $stash }); isa_ok($checkout->stash, 'CustomStash'); isa_ok($checkout->stash, 'Handel::Checkout::Stash'); + is($checkout->stash->{'foo'}, 'bar', 'stash item is set'); + + $checkout->stash->clear; + is_deeply($checkout->stash, {}, 'stash is now clear') }; @@ -58,7 +61,22 @@ sub run { isa_ok($checkout->stash, 'CustomStash'); isa_ok($checkout->stash, 'Handel::Checkout::Stash'); }; +}; + +## test for exception when non-hashref is given +{ + try { + local $ENV{'LANG'} = 'en'; + my $stash = Handel::Checkout::Stash->new([]); + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception caught'); + like(shift, qr/not a hash ref/i, 'message contains not a hashref'); + } otherwise { + fail('Other exception caught'); + }; }; t/checkout_stash.t @@ -1,6 +1,6 @@ # $Id$ <IfModule mod_perl.c> - PerlSetVar db_name @documentroot@/xsp.db + PerlSetVar db_name @ServerRoot@/var/axkit.db PerlSetVar db_driver "SQLite" <IfDefine APACHE1> @@ -14,7 +14,7 @@ AxAddXSPTaglib AxKit::XSP::Handel::Cart AxAddXSPTaglib AxKit::XSP::Handel::Checkout AxAddXSPTaglib AxKit::XSP::Handel::Order - + <Files *.xsp> SetHandler AxKit </Files> t/conf/extra.conf.in @@ -1,31 +1,127 @@ #!perl -wT # $Id$ +## no critic (ProhibitPackageVars) use strict; use warnings; -use Test::More tests => 9; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 29; + use Scalar::Util qw/refaddr/; + + local $ENV{'MOD_PERL_API_VERSION'} = 100; + use_ok('Handel::ConfigReader'); + use_ok('Handel'); + use_ok('Handel::Exception', ':try'); }; my $cfg = Handel::ConfigReader->new(); isa_ok($cfg, 'Handel::ConfigReader'); + +## MOD_PERL_API_VERSION was bogus, but set +is($Handel::ConfigReader::MOD_PERL, 0, 'MOD_PERL should be zero'); + + +## get a setting from ENV { local $ENV{'MySetting'} = 23; - ok(exists $cfg->{'MySetting'}); - is($cfg->get('MySetting'), $ENV{'MySetting'}); - is($cfg->get('MyOtherSetting', 25), 25); + ok(exists $cfg->{'MySetting'}, 'MySetting exists in ENV'); + is($cfg->get('MySetting'), 23, 'MySetting is 23'); + is($cfg->get('MyOtherSetting', 25), 25, 'Return default when nothing exists'); - ok(!exists $cfg->{'JunkSetting'}); + ok(!exists $cfg->{'JunkSetting'}, 'Bogus setting does not exist'); }; ## test defaults and their way through get/tied hash { - local $Handel::ConfigReader::Defaults{'MyDefault'} = 'Default'; + local $Handel::ConfigReader::DEFAULTS{'MyDefault'} = 'Default'; + + ok(exists $cfg->{'MyDefault'}, 'MyDefault exists'); + is($cfg->get('MyDefault'), 'Default', 'get MyDefault returns default from %Defaults'); + is($cfg->{'MyDefault'}, 'Default', 'MyDefault returns default from %Defaults'); +}; + + +## setting tied hash key does nothing to config value +{ + local $ENV{'MySetting'} = 23; + is($cfg->{'MySetting'}, 23, 'MySetting is 23'); + $cfg->{'MySetting'} = 24; + is($cfg->{'MySetting'}, 23, 'MySetting is still 23'); +}; + + +## deleting tied hash key does nothing to config value +{ + local $ENV{'MySetting'} = 23; + is($cfg->{'MySetting'}, 23, 'MySetting is 23'); + delete $cfg->{'MySetting'}; + is($cfg->{'MySetting'}, 23, 'MySetting is still 23'); +}; + + +## clearing tied hash key does nothing to config value +{ + local $ENV{'MySetting'} = 23; + is($cfg->{'MySetting'}, 23, 'MySetting is 23'); + %{$cfg} = (); + is($cfg->{'MySetting'}, 23, 'MySetting is still 23'); +}; + - ok(exists $cfg->{'MyDefault'}); - is($cfg->get('MyDefault'), 'Default'); - is($cfg->{'MyDefault'}, 'Default'); -}; \ No newline at end of file +## send a ref through the werks +{ + local %Handel::ConfigReader::DEFAULTS = ('MP1DefaultRef' => {}); + isa_ok($cfg->{'MP1DefaultRef'}, 'HASH', 'return ref passed through defaults'); +}; + + +## return undef if new doesn't +{ + no warnings 'redefine'; + local *Handel::ConfigReader::new = sub {undef}; + + is(Handel::ConfigReader->instance, undef, 'no new returns undef'); +}; + + +## get the same instance +{ + my $instance1 = Handel::ConfigReader->instance; + my $instance2 = Handel::ConfigReader->instance; + isa_ok($instance1, 'Handel::ConfigReader'); + isa_ok($instance2, 'Handel::ConfigReader'); + is(refaddr $instance1, refaddr $instance2, 'instance returns the same instance'); +}; + + +## throw exception when setting bogus config class +{ + try { + local $ENV{'LANG'} = 'en'; + Handel->config_class('Bogus'); + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('Argument exception thrown'); + like(shift, qr/could not be loaded/i, 'class not loaded in exception message'); + is(Handel->config_class, 'Handel::ConfigReader', 'config class is still set'); + } otherwise { + fail('Other exception thrown'); + }; +}; + + +# get the config reader +{ + my $config = Handel->config; + isa_ok($config, 'Handel::ConfigReader'); + + my $reconfig = Handel->config; + isa_ok($reconfig, 'Handel::ConfigReader'); + + is(refaddr $config, refaddr $reconfig, 'config returns same instance'); +}; t/config.t @@ -2,15 +2,17 @@ # $Id$ use strict; use warnings; -use Test::More qw(no_plan); BEGIN { + use lib 't/lib'; + use Handel::Test tests => 49; + use_ok('Handel::Constants', qw(:all)); }; foreach my $const (@Handel::Constants::EXPORT_OK) { can_ok(__PACKAGE__, $const); if ($const =~ /[A-Z_]/g) { - is(str_to_const($const), Handel::Constants->$const); + is(str_to_const($const), Handel::Constants->$const, 'constant works as method'); }; }; t/constants.t @@ -2,9 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More tests => 7; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 7; + use_ok('Handel::Constraints', qw(:all)); use_ok('Handel::Constants', qw(:cart)); }; t/constraints_cart_type.t @@ -2,9 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More tests => 18; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 20; + use_ok('Handel::Constraints', qw(:all)); use_ok('Handel::Checkout'); use_ok('Handel::Constants', qw(:checkout)); @@ -14,6 +16,8 @@ BEGIN { ok(!constraint_checkout_phase('junk.foo'), 'alpha gibberish type'); ok(!constraint_checkout_phase(-14), 'negative number type'); ok(!constraint_checkout_phase(23), 'out of range type'); +ok(!constraint_checkout_phase(undef), 'value is undefined'); +ok(!constraint_checkout_phase(''), 'value is empty string'); ok(constraint_checkout_phase(CHECKOUT_PHASE_INITIALIZE), 'checkout initialize phase'); ok(constraint_checkout_phase(CHECKOUT_PHASE_VALIDATE), 'checkout validation phase'); ok(constraint_checkout_phase(CHECKOUT_PHASE_AUTHORIZE), 'checkout authorization phase'); @@ -28,6 +32,6 @@ ok(constraint_checkout_phase(CHECKOUT_PHASE_DELIVER), 'checkout delivery phase') can_ok('main', 'CUSTOM_CHECKOUT_PHASE'); ok(constraint_checkout_phase(Handel::Constants->CUSTOM_CHECKOUT_PHASE), 'custom checkout phase'); ok(constraint_checkout_phase(&CUSTOM_CHECKOUT_PHASE), 'custom checkout phase'); - is(Handel::Constants->CUSTOM_CHECKOUT_PHASE, 99); - is(&CUSTOM_CHECKOUT_PHASE, 99); + is(Handel::Constants->CUSTOM_CHECKOUT_PHASE, 99, 'custom phase value returned as a method'); + is(&CUSTOM_CHECKOUT_PHASE, 99, 'custom phase value returned as a constant'); }; t/constraints_checkout_phase.t @@ -2,19 +2,23 @@ # $Id$ use strict; use warnings; -use Test::More tests => 5; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 7; + use_ok('Handel::Constraints', qw(:all)); }; -ok(constraint_currency_code('usd')); -ok(constraint_currency_code('USD')); -ok(!constraint_currency_code('USDD')); +ok(!constraint_currency_code(undef), 'value is undefined'); +ok(!constraint_currency_code(''), 'value is empty string'); +ok(constraint_currency_code('usd'), 'value is lower case'); +ok(constraint_currency_code('USD'), 'value is upper case'); +ok(!constraint_currency_code('USDD'), 'value is too long'); SKIP: { eval 'use Locale::Currency'; skip 'Locale::Currency not installed', 1 if $@; - ok(!constraint_currency_code('ZZZ')); + ok(!constraint_currency_code('ZZZ'), 'valid is invalid code'); }; t/constraints_currency_code.t @@ -2,9 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More tests => 7; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 9; + use_ok('Handel::Constraints', qw(:all)); use_ok('Handel::Constants', qw(:order)); }; @@ -12,5 +14,7 @@ BEGIN { ok(!constraint_order_type('junk.foo'), 'alpha gibberish type'); ok(!constraint_order_type(-14), 'negative number type'); ok(!constraint_order_type(23), 'out of range type'); +ok(!constraint_order_type(undef), 'undefined value'); +ok(!constraint_order_type(''), 'value is empty string'); ok(constraint_order_type(ORDER_TYPE_SAVED), 'order type saved'); ok(constraint_order_type(ORDER_TYPE_TEMP), 'order type temp'); t/constraints_order_type.t @@ -2,13 +2,18 @@ # $Id$ use strict; use warnings; -use Test::More tests => 14; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 20; + use_ok('Handel::Constraints', qw(:all)); + use_ok('Handel::Currency'); }; ok(!constraint_price('junk.foo'), 'alpha gibberish price'); +ok(!constraint_price(undef), 'value is undefined'); +ok(!constraint_price(''), 'value is empty string'); ok(!constraint_price(-14), 'negative number price'); ok(!constraint_price(-25.79), 'negative float price'); ok(constraint_price(0), 'zero price'); @@ -21,3 +26,19 @@ ok(constraint_price(25.89), 'positive float price'); ok(constraint_price(100.00), 'positive float price'); ok(constraint_price(99999.99), 'positive float price'); ok(constraint_price('34.66'), 'positive float price string'); +ok(constraint_price(Handel::Currency->new(1.23)), 'with a currency object'); +ok(constraint_price(bless({value => 1.23}, 'CustomCurrency')), 'with a non-currency object'); +ok(!constraint_price(bless({value => 'abc'}, 'CustomCurrency')), 'with a non-currency object'); + +package CustomCurrency; +use strict; +use warnings; +use overload + '0+' => sub {shift->value}, + 'bool' => sub {shift->value}, + '""' => sub {shift->value}, + fallback => 1; + +sub value {return shift->{'value'}}; + +1; \ No newline at end of file t/constraints_price.t @@ -2,13 +2,17 @@ # $Id$ use strict; use warnings; -use Test::More tests => 13; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 26; + use_ok('Handel::Constraints', ':all'); use_ok('Handel::Exception', ':try'); }; +ok(!constraint_quantity(undef), 'value is undefined'); +ok(!constraint_quantity(''), 'value is empty string'); ok(!constraint_quantity(-12), 'negative quantity'); ok(!constraint_quantity(0), 'zero quantity'); ok(!constraint_quantity('abc'), 'alpha quantity'); @@ -25,16 +29,32 @@ ok(constraint_quantity(1), 'numeric quantity'); ok(constraint_quantity(5), 'quantity <= max'); try { + local $ENV{'LANG'} = 'en'; constraint_quantity(6); - fail; + fail('no exception thrown'); } catch Handel::Exception::Constraint with { - pass; + pass('caught constraint exception'); + like(shift, qr/quantity requested.*greater than.*allowed/i, 'failed constraint in message'); } otherwise { - fail; + fail('caught other exception'); }; }; +## test max quantity with exception action but no max +{ + local $ENV{'HandelMaxQuantity'} = ''; + local $ENV{'HandelMaxQuantityAction'} = 'Exception'; + + ok(constraint_quantity(5), 'quantity <= max'); + + my $hash = {quantity => 2}; + my $object = bless {}, 'Fake'; + + ok(constraint_quantity(7, $object, undef, $hash), 'constraint passes with no max'); + is($hash->{'quantity'}, 2, 'quantity is unchanged'); +}; + ## test max quantity adjustment { local $ENV{'HandelMaxQuantity'} = 5; @@ -44,6 +64,45 @@ ok(constraint_quantity(1), 'numeric quantity'); my $hash = {quantity => 2}; my $object = bless {}, 'Fake'; - ok(constraint_quantity(7, $object, undef, $hash)); - is($hash->{'quantity'}, 5); + ok(constraint_quantity(7, $object, undef, $hash), 'quantity adjusted'); + is($hash->{'quantity'}, 5, 'quantity adjusted'); +}; + + +## test max quantity adjustment with object but no value +{ + local $ENV{'HandelMaxQuantity'} = 5; + local $ENV{'HandelMaxQuantityAction'} = 'Adjust'; + + my $hash = {quantity => 2}; + my $object = bless {}, 'Fake'; + + ok(!constraint_quantity(0, $object, undef, $hash), 'constraint fails without value'); + is($hash->{'quantity'}, 2, 'quantity unchanged'); +}; + +## test max quantity adjustment with object and value less than max +{ + local $ENV{'HandelMaxQuantity'} = 5; + local $ENV{'HandelMaxQuantityAction'} = 'Adjust'; + + my $hash = {quantity => 2}; + my $object = bless {}, 'Fake'; + + ok(constraint_quantity(3, $object, undef, $hash), 'constraint passes less than max'); + is($hash->{'quantity'}, 2, 'quantity unchanged'); +}; + +## test quantity with bogus adjustment type +{ + local $ENV{'HandelMaxQuantity'} = 5; + local $ENV{'HandelMaxQuantityAction'} = 'Boom'; + + ok(constraint_quantity(6), 'ignore max if action is bogus'); + + my $hash = {quantity => 2}; + my $object = bless {}, 'Fake'; + + ok(constraint_quantity(7, $object, undef, $hash), 'constraint passes wit bogus adjustment type'); + is($hash->{'quantity'}, 2, 'quantity is unchanged'); }; t/constraints_quantity.t @@ -2,9 +2,11 @@ # $Id$ use strict; use warnings; -use Test::More tests => 5; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 7; + use_ok('Handel::Constraints', qw(:all)); }; @@ -21,3 +23,6 @@ ok(!constraint_uuid('{D597DEED-5B9F-11D1-8DD2-00AA004ABD5E}'), ok(constraint_uuid('D597DEED-5B9F-11D1-8DD2-00AA004ABD5E'), 'valid uuid' ); + +ok(!constraint_uuid(undef), 'value is undefined'); +ok(!constraint_uuid(''), 'value is empty string'); t/constraints_uuid.t @@ -2,113 +2,523 @@ # $Id$ use strict; use warnings; -use Test::More tests => 24; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 142; + use Scalar::Util qw/refaddr/; + + eval 'use Test::MockObject 1.07'; + if (!$@) { + Test::MockObject->fake_module('Finance::Currency::Convert::WebserviceX' => ( + new => sub {return bless {}, shift}, + convert => sub {return $_[1]+1.00} + )); + }; + use_ok('Handel::Currency'); use_ok('Handel::Exception', ':try'); }; -## test stringification and returns in the absence of -## Locale::Currency::Format + +## create with no value { - my $currency = Handel::Currency->new(1.2); + my $currency = Handel::Currency->new; isa_ok($currency, 'Handel::Currency'); - is($currency, 1.2); - - - eval 'use Locale::Currency::Format'; - if ($@) { - is($currency->format, 1.2); - is($currency->format('CAD'), 1.2); - is($currency->format(undef, 'FMT_NAME'), 1.2); - is($currency->format('CAD', 'FMT_NAME'), 1.2); - } else { - is($currency->format, '1.20 USD'); - is($currency->format('CAD'), '1.20 CAD'); - is($currency->format(undef, 'FMT_NAME'), '1.20 US Dollar'); - is($currency->format('CAD', 'FMT_NAME'), '1.20 Canadian Dollar'); - }; + is($currency->value, 0, 'value was set'); + is($currency->stringify, '0.00 USD', 'stringify to format'); + is($currency->code, 'USD', 'code is default'); + is($currency->format, 'FMT_STANDARD', 'format is default'); + is($currency->converter, undef, 'converter no defined'); }; -SKIP: { - eval 'use Finance::Currency::Convert::WebserviceX 0.03'; - skip 'Finance::Currency::Convert::WebserviceX 0.03 not installed', 8 if $@; +## create new with no options +{ + my $currency = Handel::Currency->new(1.23); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 USD', 'stringify to value'); + is($currency->code, 'USD', 'code is default'); + is($currency->format, 'FMT_STANDARD', 'format is default'); + is($currency->converter, undef, 'converter no defined'); +}; + - my $currency = Handel::Currency->new(1); +## create new with code/format +{ + my $currency = Handel::Currency->new(1.23, 'CAD', 'FMT_COMMON'); isa_ok($currency, 'Handel::Currency'); - is($currency, 1); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '$1.23', 'stringify to value'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 'FMT_COMMON', 'format was set'); + is($currency->converter, undef, 'converter no defined'); +}; + +## throw exception when bad currency code is set in new +{ try { - $currency->convert('CRAP', 'CAD'); + local $ENV{'LANG'} = 'en'; + my $currency = Handel::Currency->new(1.23, 'BAD'); - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); } otherwise { - fail; + fail('Other exception thrown'); }; +}; + + +## create and set code +{ + my $currency = Handel::Currency->new(1.23); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 USD', 'stringify to value'); + is($currency->code, 'USD', 'code not set'); + is($currency->format, 'FMT_STANDARD', 'code not set'); + is($currency->converter, undef, 'converter no defined'); + + $currency->code('USD'); + is($currency->code, 'USD', 'code set'); +}; + + +## throw exception when bad currency code is set +{ + my $currency = Handel::Currency->new(1.23); try { - $currency->convert('USD', 'JUNK'); + local $ENV{'LANG'} = 'en'; - fail; + $currency->code('BAD'); + + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); } otherwise { - fail; + fail('Other exception thrown'); }; +}; - is($currency->convert('USD', 'USD'), undef); - ok($currency->convert('USD', 'CAD')); - { - local $ENV{'HandelCurrencyCode'} = 'CAD'; - is($currency->convert(undef, 'CAD'), undef); - ok($currency->convert(undef, 'USD')); - } +## throw exception when bad currency code is set in ENV and pulled into format +{ + my $currency = Handel::Currency->new(1.23); + + try { + local $ENV{'LANG'} = 'en'; + local $ENV{'HandelCurrencyCode'} = 'BAD'; + + $currency->stringify; + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); + } otherwise { + my $E = shift; + diag $E; + diag ref $E; + fail('Other exception thrown'); + }; }; -SKIP: { - eval 'use Locale::Currency'; - skip 'Locale::Currency not installed', 4 if $@; - my $currency = Handel::Currency->new(1); - isa_ok($currency, 'Handel::Currency'); - is($currency, 1); +## throw exception when bad currency code is set in Defaults and pulled into format +{ + my $currency = Handel::Currency->new(1.23); try { - $currency->convert('ZZZ', 'CAD'); + local $ENV{'LANG'} = 'en'; + local $ENV{'HandelCurrencyCode'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyCode'} = 'BAD'; + + $currency->stringify; - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); } otherwise { - fail; + fail('Other exception thrown'); }; +}; + + +## throw exception when no code is set during format +{ + my $currency = Handel::Currency->new(1.23); try { - $currency->convert('USD', 'ZZZ'); + local $ENV{'LANG'} = 'en'; + local $ENV{'HandelCurrencyCode'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyCode'} = ''; + + $currency->stringify; - fail; + fail('no exception thrown'); } catch Handel::Exception::Argument with { - pass; + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); } otherwise { - fail; + fail('Other exception thrown'); }; }; + +## format using stock default +{ + local $ENV{'HandelCurrencyFormat'} = ''; + + my $currency = Handel::Currency->new(1.23, 'CAD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 CAD', 'stringify to default'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 'FMT_STANDARD', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using altered default +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = 'FMT_SYMBOL'; + + my $currency = Handel::Currency->new(1.23, 'CAD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '$1.23', 'stringify to value'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 'FMT_SYMBOL', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using object format +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = 'FMT_SYMBOL'; + + my $currency = Handel::Currency->new(1.23, 'CAD', 'FMT_HTML'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '&#x0024;1.23', 'got object default format'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 'FMT_HTML', 'format was set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using object format as value instead of string +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = 'FMT_SYMBOL'; + + my $currency = Handel::Currency->new(1.23, 'CAD', 0x0010); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '&#x0024;1.23', 'got object default format'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 0x0010, 'format was set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using format param +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = 'FMT_SYMBOL'; + + my $currency = Handel::Currency->new(1.23, 'CAD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify('FMT_HTML'), '&#x0024;1.23', 'got param format'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, 'FMT_SYMBOL', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using format param as value instead of string +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = 'FMT_SYMBOL'; + + my $currency = Handel::Currency->new(1.23, 'CAD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify(0x0010), '&#x0024;1.23', 'got param format'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format,'FMT_SYMBOL', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## format using no format (Local::Currency::Format defaults) +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = ''; + + my $currency = Handel::Currency->new(1.23, 'CAD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '$1.23', 'got object default format'); + is($currency->code, 'CAD', 'code was set'); + is($currency->format, undef, 'format is not set'); + is($currency->converter, undef, 'converter not defined'); +}; + + +## get name +{ + local $ENV{'HandelCurrencyFormat'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyFormat'} = ''; + + my $currency = Handel::Currency->new(1.23, 'USD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->code, 'USD', 'code was set'); + is($currency->name, 'US Dollar', 'got name'); +}; + + +## get name with code from ENV +{ + local $ENV{'HandelCurrencyCode'} = 'USD'; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyCode'} = ''; + + my $currency = Handel::Currency->new(1.23); + isa_ok($currency, 'Handel::Currency'); + is($currency->code, 'USD', 'code is not set'); + is($currency->name, 'US Dollar', 'got name'); +}; + + +## throw exception when code is set for name +{ + my $currency = Handel::Currency->new(1.23); + + try { + local $ENV{'LANG'} = 'en'; + local $ENV{'HandelCurrencyCode'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyCode'} = ''; + + $currency->name; + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); + } otherwise { + fail('Other exception thrown'); + }; +}; + + +## throw exception when converter_class can't be loaded +{ + try { + local $ENV{'LANG'} = 'en'; + Handel::Currency->converter_class('Bogus'); + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('Exception thrown'); + like(shift, qr/bogus could not be loaded/i, 'class not loaded in message'); + } otherwise { + my $E = shift; + diag $E; + diag ref $E; + fail('Other exception thrown'); + }; +}; + + +## test convert SKIP: { - eval 'use Locale::Currency'; - eval 'use Finance::Currency::Convert::WebserviceX 0.03' if !$@; - eval 'use Locale::Currency::Format' if !$@; - skip 'Format and Convert not installed', 4 if $@; + eval 'use Test::MockObject 1.07'; + skip 'Test::MockObject 1.07 not installed', 46 if $@; + + + ## convert with code + { + my $currency = Handel::Currency->new(1.23, 'USD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 USD', 'stringify to value'); + is($currency->code, 'USD', 'code is set'); + is($currency->format, 'FMT_STANDARD', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); + + my $converted = $currency->convert('CAD'); + isa_ok($currency->converter, 'Finance::Currency::Convert::WebserviceX'); + isa_ok($converted, 'Handel::Currency'); + is($converted->value, 2.23, 'value was set'); + is($converted->stringify, '2.23 CAD', 'stringify to value'); + is($converted->code, 'CAD', 'code is set'); + is($converted->format, 'FMT_STANDARD', 'format is not set'); + }; + + + ## convert with code using ENV + { + local $ENV{'HandelCurrencyCode'} = 'USD'; + + my $currency = Handel::Currency->new(1.23); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 USD', 'stringify to value'); + is($currency->code, 'USD', 'code is not set'); + is($currency->format, 'FMT_STANDARD', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); + + my $converted = $currency->convert('CAD'); + isa_ok($currency->converter, 'Finance::Currency::Convert::WebserviceX'); + isa_ok($converted, 'Handel::Currency'); + is($converted->value, 2.23, 'value was set'); + is($converted->stringify, '2.23 CAD', 'stringify to value'); + is($converted->code, 'CAD', 'code is set'); + is($converted->format, 'FMT_STANDARD', 'format is not set'); + }; + + + ## test when converter returns nothing + { + Test::MockObject->fake_module('Finance::Currency::Convert::WebserviceX' => ( + new => sub {return bless {}, shift}, + convert => sub {} + )); + + my $currency = Handel::Currency->new(1.23, 'USD'); + my $converted = $currency->convert('CAD'); + isa_ok($converted, 'Handel::Currency'); + is($converted->value, 0, 'value is 0 when converter fails'); + is($converted->stringify, '0.00 CAD', 'stringify to value'); + is($converted->code, 'CAD', 'code is set'); + is($converted->format, 'FMT_STANDARD', 'format is not set'); + }; + + + ## throw exception when no code is set during convert + { + my $currency = Handel::Currency->new(1.23); + + try { + local $ENV{'LANG'} = 'en'; + local $ENV{'HandelCurrencyCode'} = ''; + local $Handel::ConfigReader::DEFAULTS{'HandelCurrencyCode'} = ''; + + $currency->convert('CAD'); + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); + } otherwise { + fail('Other exception thrown'); + }; + }; + + + ## throw exception when no code is passed to convert + { + my $currency = Handel::Currency->new(1.23, 'USD'); + + try { + local $ENV{'LANG'} = 'en'; + + $currency->convert; + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); + } otherwise { + fail('Other exception thrown'); + }; + }; + + + ## throw exception when bad code is returned from code into convert + { + my $currency = Handel::Currency->new(1.23, 'USD'); + + try { + local $ENV{'LANG'} = 'en'; + + no warnings 'redefine'; + local *Handel::Currency::code = sub { + return 'BOGUS'; + }; + + $currency->convert('CAD'); + + fail('no exception thrown'); + } catch Handel::Exception::Argument with { + pass('Argument exception thrown'); + like(shift, qr/currency code/i, 'currency code in message'); + } otherwise { + fail('Other exception thrown'); + }; + }; + + + ## return self if to is same as from + { + my $currency = Handel::Currency->new(1.23, 'USD'); + isa_ok($currency, 'Handel::Currency'); + is($currency->value, 1.23, 'value was set'); + is($currency->stringify, '1.23 USD', 'stringify to value'); + is($currency->code, 'USD', 'code is set'); + is($currency->format, 'FMT_STANDARD', 'format is not set'); + is($currency->converter, undef, 'converter not defined'); + + my $converted = $currency->convert('USD'); + is($currency->converter, undef, 'converter not defined'); + is(refaddr $converted, refaddr $currency, 'return self if codes are the same'); + isa_ok($converted, 'Handel::Currency'); + is($converted->value, 1.23, 'value was set'); + is($converted->stringify, '1.23 USD', 'stringify to value'); + is($converted->code, 'USD', 'code is set'); + is($converted->format, 'FMT_STANDARD', 'format is not set'); + }; +}; + + +## test loading of utf8 +{ + local $] = 5.007999; my $currency = Handel::Currency->new(1.23); isa_ok($currency, 'Handel::Currency'); - is($currency, 1.23); + is($currency->stringify, '1.23 USD', 'still got format'); +}; + - ok($currency->convert('USD', 'CAD', 1, 'FMT_STANDARD') =~ / CAD$/); - ok($currency->convert('USD', 'CAD', 0, 'FMT_STANDARD') !~ / CAD$/); -}; \ No newline at end of file +## set converter_class to nothing, and put it back +{ + Handel::Currency->converter_class(undef); + is(Handel::Currency->converter_class, 'Finance::Currency::Convert::WebserviceX', 'unset converter_class'); + + Handel::Currency->converter_class('Handel::Base'); + is(Handel::Currency->converter_class, 'Handel::Base', 'set converter_class'); + + Handel::Currency->converter_class('CustomConverterClass'); + is(Handel::Currency->converter_class, 'CustomConverterClass', 'set converter_class'); +}; + + +package CustomConverterClass; +use strict; +use warnings; + +BEGIN { + use base qw/Finance::Currency::Convert::WebserviceX/; +}; +1; \ No newline at end of file t/currency.t @@ -2,9 +2,10 @@ # $Id$ use strict; use warnings; -use Test::More tests => 3; BEGIN { + use lib 't/lib'; + use Handel::Test tests => 44; use_ok('Handel::Exception', qw(:try)); }; @@ -13,13 +14,95 @@ BEGIN { { try { throw Handel::Exception::Argument(-text => 'foo'); + + fail('no exception thrown'); } catch Handel::Exception with { - is(shift->text, 'foo') + pass('caught exception'); + is(shift->text, 'foo', 'got foo message') + } otherwise { + fail('Other exception thrown'); }; try { throw Handel::Exception::Argument(-text => 'foo', -details => 'details'); + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('caught exception'); + is($_[0]->text, 'foo: details', 'got foo message with details'); + is($_[0]->details, 'details', 'details set'); + } otherwise { + fail('Other exception thrown'); + }; +}; + + +## get default text +{ + try { + local $ENV{'LANG'} = 'en'; + throw Handel::Exception; + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('caught exception'); + like($_[0]->text, qr/unspecified/, 'unhandled exception in message'); + is($_[0]->details, undef, 'details not set'); + } otherwise { + fail('Other exception thrown'); + }; +}; + + +## don't set details if it's a ref +{ + try { + local $ENV{'LANG'} = 'en'; + throw Handel::Exception(-details => {foo => 'bar'}); + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('caught exception'); + is($_[0]->text, 'An unspecified error has occurred', 'unhandled exception in message'); + is_deeply($_[0]->details, {foo => 'bar'}, 'details still set'); + } otherwise { + fail('Other exception thrown'); + }; +}; + + +## set the results +{ + try { + local $ENV{'LANG'} = 'en'; + throw Handel::Exception( -results => {foo => 'bar'}); + + fail('no exception thrown'); } catch Handel::Exception with { - is(shift->text, 'foo: details') + pass('caught exception'); + like($_[0]->text, qr/unspecified/, 'unhandled exception in message'); + is($_[0]->details, undef, 'details not set'); + is_deeply($_[0]->results, {foo => 'bar'}, 'results were set'); + } otherwise { + fail('Other exception thrown'); }; -}; \ No newline at end of file +}; + + +## make sure everyone still works +foreach (qw/Taglib Order Checkout Constraint Storage Validation Virtual/) { + my $class = "Handel::Exception::$_"; + try { + local $ENV{'LANG'} = 'en'; + throw $class; + + fail('no exception thrown'); + } catch Handel::Exception with { + pass('caught exception'); + isa_ok($_[0], 'Handel::Exception'); + ok($_[0]->text, 'test is set'); + is($_[0]->details, undef, 'details not set'); + } otherwise { + fail('Other exception thrown'); + }; +}; t/exceptions.t @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="EF254990-53FB-46DA-8B8A-A287698D3E6A" sku="SKU1" price="1.11" quantity="2" description="Description 1" total="2.22"/> </order:results> @@ -149,4 +149,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_currency_format.xsp @@ -26,7 +26,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -48,7 +48,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <count><order:count/></count> @@ -99,4 +99,4 @@ </order:no-results> </order:new> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new.xsp @@ -26,7 +26,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -48,7 +48,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <order:add> @@ -120,4 +120,4 @@ </order:no-results> </order:new> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new_and_add.xsp @@ -26,7 +26,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -48,7 +48,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <order:add price="1.23" quantity="2" sku="NEWSKU123"> @@ -117,4 +117,4 @@ </order:no-results> </order:new> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new_and_add_filtered.xsp @@ -24,7 +24,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -46,7 +46,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <count><order:count/></count> @@ -97,4 +97,4 @@ </order:no-results> </order:new> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> </order:new> <order:order id="1F5284C7-C4F3-4399-87DF-494E1CACD50B"> <order:results> @@ -95,4 +95,4 @@ </order:results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new_minimal.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results> <message>Error creating order</message> </order:no-results> @@ -98,4 +98,4 @@ </order:results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_new_no_results_trigger.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <count><order:count/></count> @@ -169,4 +169,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_add.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order> <count><order:count/></count> @@ -166,4 +166,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_add_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -201,4 +201,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_clear.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -215,4 +215,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_delete.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -214,4 +214,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_delete_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results> <message>Error creating order</message> </order:no-results> @@ -103,4 +103,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="EF254990-53FB-46DA-8B8A-A287698D3E64" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="52A5DFED-D018-409F-9E59-584ACA152725" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -122,4 +122,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_item.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="AFC8635B-89A2-4A09-9DC0-59DA2CDDF9F8" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="E6ECB392-FBFA-4BFB-B5EC-AB98CBDAE5FD" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -123,4 +123,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_item_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="14E451AF-198E-4043-BEA1-5D2058A7B96F" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="3BA3434A-183D-4E17-BA91-0EA15CD35F73" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -123,4 +123,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_item_filtered_no_results.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="18C9050C-1973-4A56-A7C6-F609BD204898" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="C2B8F092-2AAF-4D59-845F-2A119E4408B5" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -138,4 +138,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_item_update.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="251371DD-B19C-4D03-B0E7-6A828E5CA14E" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="2330BAA8-288B-4102-988E-BA1ABA0A5BE8" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -122,4 +122,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_items.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="8CB01B28-CF5A-4F4E-B7B7-CFF9F0ACA534" sku="NEWSKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="46C2D004-4694-4C66-B901-8E2CEE6CB9FD" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -124,4 +124,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_items_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="A07077F7-C31D-44CD-B2E2-7AE7FA358C11" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="E0E20484-A9EE-4CCA-BF02-6E3F3D27EA9A" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -123,4 +123,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_items_filtered_no_results.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="E766EAC7-CB67-4BFC-A54F-592B1F029363" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="AC156B65-0779-4D96-AE72-CAB2E981F34E" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -137,4 +137,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_items_update.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results> <message>Error creating order</message> </order:no-results> @@ -114,7 +114,7 @@ <order:billtofax>U3-333-333-3333</order:billtofax> <order:billtoemail>Umendlefarg@gmail.com</order:billtoemail> <order:comments>UComments</order:comments> - <order:created>U20050715T201234Z</order:created> + <order:created>2005-07-17 20:12:34</order:created> <order:handling>8.96</order:handling> <order:number>O123456786</order:number> <order:shipmethod>UPS 2nd Day</order:shipmethod> @@ -136,7 +136,7 @@ <order:subtotal>37.96</order:subtotal> <order:total>37.96</order:total> <order:tax>6.67</order:tax> - <order:updated>U20050716T201234Z</order:updated> + <order:updated>2005-07-18 20:12:34</order:updated> </order:update> <order> <count><order:count/></count> @@ -187,4 +187,4 @@ </order:no-results> </order:order> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_order_update.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -66,7 +66,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -88,7 +88,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> @@ -143,4 +143,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -66,7 +66,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -88,7 +88,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -109,7 +109,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -131,7 +131,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> @@ -196,4 +196,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_add.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -66,7 +66,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -88,7 +88,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -109,7 +109,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -131,7 +131,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> @@ -193,4 +193,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_add_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -124,7 +124,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -146,7 +146,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -262,4 +262,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_clear.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -92,7 +92,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -114,7 +114,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -200,4 +200,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_delete.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -92,7 +92,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -114,7 +114,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add> <order:description>My New Item</order:description> @@ -198,4 +198,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_delete_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -66,7 +66,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -88,7 +88,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> <order:new> @@ -109,7 +109,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -131,7 +131,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results><message>Error adding order</message></order:no-results> </order:new> @@ -187,4 +187,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="F22226DF-8B5D-496D-95BC-5134B39ED797" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="D4755257-AC3D-47AC-9F04-B17F5F5B11E9" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="E7C40FA5-5C34-4174-B63F-A9EF595E4AEF" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="32CB33D2-B2F5-41F6-BB81-C5C7E05D9F3A" sku="SKU4" price="4.44" quantity="4" description="Description 4" total="16.64"/> @@ -171,4 +171,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_item.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="98D2FCE0-CEB6-4464-8CE4-FBC9D71AC4A4" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="1A43BAF1-AFDF-4E92-AFA1-8C4EFE61B399" sku="FILTERSKU1" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="D454144C-0E1A-4BF5-BE6F-C3D26AE01EBE" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="6DE112DE-0EB6-49C3-B292-B522463B5E07" sku="FILTERSKU2" price="4.44" quantity="4" description="Description 4" total="16.61"/> @@ -172,4 +172,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_item_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="1A29F1FE-A889-4B2B-8863-95448EFA37F9" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="E371A091-5879-4BF9-81F7-FC431193F29B" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="5EACD7B1-4966-4507-AF61-92D0FA319515" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="17837E8E-E386-4BB5-8857-C9B53BF15F7B" sku="SKU4" price="4.44" quantity="4" description="Description 4" total="17.76"/> @@ -172,4 +172,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_item_filtered_no_results.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="8DC05B6C-9B24-43F1-B2C4-20B49C65CA01" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> </order:results> @@ -71,7 +71,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -93,7 +93,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="50247962-98B2-4272-BBD4-4023FB77A8AE" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> </order:results> @@ -184,4 +184,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_item_update.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="0D07A9B2-BA0C-4942-94D0-D96DCA3389DB" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="C7DAE698-5ABB-4212-976A-8006CCBD7D36" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="A31CBE50-87CA-450C-9439-223167B7904D" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="5E5DADE4-33D8-474D-8362-2A92327FF184" sku="SKU4" price="4.44" quantity="4" description="Description 4" total="17.76"/> @@ -171,4 +171,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_items.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="93B9A497-9FEE-4C87-A204-C822A4959682" sku="FILTERSKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="877246AF-96D3-4C28-BBF1-B8673278BD9C" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -73,7 +73,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -95,7 +95,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="07D7181B-70F4-4F2C-BF10-0C554D0F7A0C" sku="FILTERSKU3" price="4.44" quantity="4" description="Description 4" total="17.76"/> <order:add id="30D35F53-4958-477D-9450-3A6C9FEDA856" sku="SKU5" price="5.55" quantity="5" description="Description 5" total="25.50"/> @@ -174,4 +174,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_items_filtered.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="9108720A-7DD1-43E8-80F0-499205BBC0AD" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="6DAF3A43-40BC-4BD2-8870-2634D70CBE19" sku="FILTERSKU1" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="9D7FA3F4-14B4-4F8A-8B73-1ED8F4F73C59" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="FEFFC372-1E72-4B68-BA28-2A9263496E7C" sku="FILTERSKU2" price="4.44" quantity="4" description="Description 4" total="17.76"/> @@ -172,4 +172,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_items_filtered_no_results.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="E72CC2DA-1C87-4A4D-9BD5-99B1D45DB301" sku="SKU1" price="1.11" quantity="1" description="Description 1" total="1.11"/> <order:add id="0FB50961-6F51-4A6D-B224-B85BBCD8E357" sku="SKU2" price="2.22" quantity="2" description="Description 2" total="4.44"/> @@ -72,7 +72,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -94,7 +94,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:results> <order:add id="DFDAB889-CB9A-4887-9FFF-7BF4BB81D5B0" sku="SKU3" price="3.33" quantity="3" description="Description 3" total="9.99"/> <order:add id="118EB339-A5D5-4F3D-B5D7-62F5819D1CC8" sku="SKU4" price="4.44" quantity="4" description="Description 4" total="17.76"/> @@ -186,4 +186,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_items_update.xsp @@ -23,7 +23,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -45,7 +45,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results> <message>Error creating order</message> </order:no-results> @@ -68,7 +68,7 @@ <order:billtofax>3-333-333-3333</order:billtofax> <order:billtoemail>mendlefarg@gmail.com</order:billtoemail> <order:comments>Comments</order:comments> - <order:created>20050715T201234Z</order:created> + <order:created>2005-07-15 20:12:34</order:created> <order:handling>8.95</order:handling> <order:number>O123456789</order:number> <order:shipmethod>UPS Ground</order:shipmethod> @@ -90,7 +90,7 @@ <order:subtotal>37.95</order:subtotal> <order:total>37.95</order:total> <order:tax>6.66</order:tax> - <order:updated>20050716T201234Z</order:updated> + <order:updated>2005-07-16 20:12:34</order:updated> <order:no-results> <message>Error creating order</message> </order:no-results> @@ -159,7 +159,7 @@ <order:billtofax>U3-333-333-3333</order:billtofax> <order:billtoemail>Umendlefarg@gmail.com</order:billtoemail> <order:comments>UComments</order:comments> - <order:created>U20050715T201234Z</order:created> + <order:created>2005-07-17 20:12:34</order:created> <order:handling>8.96</order:handling> <order:number>O123456786</order:number> <order:shipmethod>UPS 2nd Day</order:shipmethod> @@ -181,7 +181,7 @@ <order:subtotal>37.96</order:subtotal> <order:total>37.96</order:total> <order:tax>6.67</order:tax> - <order:updated>U20050716T201234Z</order:updated> + <order:updated>2005-07-18 20:12:34</order:updated> </order:update> <order> <count><order:count/></count> @@ -232,4 +232,4 @@ </order:no-results> </order:orders> </body> -</xsp:page> \ No newline at end of file +</xsp:page> t/htdocs/axkit/order_orders_update.xsp @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Line Item SKU 1</description> <id>11111111-1111-1111-1111-111111111111</id> t/htdocs/axkit/out/checkout_order.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <handling>8.95 USD</handling> <handling>8.95 CAD</handling> @@ -62,7 +62,7 @@ <tax>6.66 CAD</tax> <tax>&amp;#x0024;6.66</tax> <tax>6.66 Canadian Dollar</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>EF254990-53FB-46DA-8B8A-A287698D3E6A</id> t/htdocs/axkit/out/order_currency_format.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> -</body> \ No newline at end of file +</body> t/htdocs/axkit/out/order_new.xsp.out @@ -28,7 +28,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -50,6 +50,6 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_new_and_add.xsp.out @@ -28,7 +28,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -50,6 +50,6 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_new_and_add_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> -</body> \ No newline at end of file +</body> t/htdocs/axkit/out/order_new_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> -</body> \ No newline at end of file +</body> t/htdocs/axkit/out/order_new_minimal.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> -</body> \ No newline at end of file +</body> t/htdocs/axkit/out/order_new_no_results_trigger.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>5.55</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <addeditem> <description>My New Item</description> @@ -71,7 +71,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -93,6 +93,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_add.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <addeditem> <description>My New Item</description> @@ -71,7 +71,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -93,6 +93,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_add_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>1</count> @@ -63,7 +63,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -85,7 +85,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>0</count> <id>B0462540-0564-4E27-B9FD-C3985A227C49</id> <shopper>E24FF465-F485-477B-8565-FDF30BB4DE13</shopper> @@ -104,7 +104,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -126,6 +126,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_clear.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>2</count> @@ -63,7 +63,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -85,7 +85,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> <id>B05779D0-6D40-4F0A-B6A3-1CC2193571C6</id> <shopper>D3D7C81D-3BA7-41E6-A8B8-34550CD6C793</shopper> @@ -104,7 +104,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -126,6 +126,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_delete.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> <id>69B4404C-6346-4FFA-8D73-220F5D65A952</id> <shopper>126AA079-B6A9-440E-9B93-4C66CEBF37EB</shopper> @@ -105,7 +105,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -127,6 +127,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_delete_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,6 +42,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>EF254990-53FB-46DA-8B8A-A287698D3E64</id> t/htdocs/axkit/out/order_order_item.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 2</description> <id>E6ECB392-FBFA-4BFB-B5EC-AB98CBDAE5FD</id> t/htdocs/axkit/out/order_order_item_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Order item not found</message> </order> </body> t/htdocs/axkit/out/order_order_item_filtered_no_results.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>18C9050C-1973-4A56-A7C6-F609BD204898</id> t/htdocs/axkit/out/order_order_item_update.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>251371DD-B19C-4D03-B0E7-6A828E5CA14E</id> t/htdocs/axkit/out/order_order_items.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 2</description> <id>46C2D004-4694-4C66-B901-8E2CEE6CB9FD</id> t/htdocs/axkit/out/order_order_items_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Order item not found</message> </order> </body> t/htdocs/axkit/out/order_order_items_filtered_no_results.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>E766EAC7-CB67-4BFC-A54F-592B1F029363</id> t/htdocs/axkit/out/order_order_items_update.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>0</count> @@ -63,7 +63,7 @@ <billtofax>U3-333-333-3333</billtofax> <billtoemail>Umendlefarg@gmail.com</billtoemail> <comments>UComments</comments> - <created>U20050715T201234Z</created> + <created>2005-07-17T20:12:34</created> <handling>8.96</handling> <number>O123456786</number> <shipmethod>UPS 2nd Day</shipmethod> @@ -85,6 +85,6 @@ <subtotal>37.96</subtotal> <total>37.96</total> <tax>6.67</tax> - <updated>U20050716T201234Z</updated> + <updated>2005-07-18T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_order_update.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>0</count> @@ -63,7 +63,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -85,6 +85,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_orders.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -108,7 +108,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -130,7 +130,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> </body> t/htdocs/axkit/out/order_orders_add.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -108,7 +108,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -130,7 +130,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> </body> t/htdocs/axkit/out/order_orders_add_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>1</count> @@ -63,7 +63,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -85,7 +85,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>1</count> @@ -106,7 +106,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -128,7 +128,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>0</count> </order> <order> @@ -150,7 +150,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -172,7 +172,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>0</count> </order> </body> t/htdocs/axkit/out/order_orders_clear.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> </body> t/htdocs/axkit/out/order_orders_delete.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <count>1</count> </order> </body> t/htdocs/axkit/out/order_orders_delete_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>0</count> @@ -63,7 +63,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -85,6 +85,6 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_orders_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>F22226DF-8B5D-496D-95BC-5134B39ED797</id> @@ -71,7 +71,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -93,7 +93,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 3</description> <id>E7C40FA5-5C34-4174-B63F-A9EF595E4AEF</id> t/htdocs/axkit/out/order_orders_item.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 2</description> <id>1A43BAF1-AFDF-4E92-AFA1-8C4EFE61B399</id> @@ -71,7 +71,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -93,7 +93,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 4</description> <id>6DE112DE-0EB6-49C3-B292-B522463B5E07</id> t/htdocs/axkit/out/order_orders_item_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Your order is empty</message> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Your order is empty</message> </order> </body> t/htdocs/axkit/out/order_orders_item_filtered_no_results.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>8DC05B6C-9B24-43F1-B2C4-20B49C65CA01</id> @@ -79,7 +79,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -101,7 +101,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 2</description> <id>50247962-98B2-4272-BBD4-4023FB77A8AE</id> t/htdocs/axkit/out/order_orders_item_update.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>0D07A9B2-BA0C-4942-94D0-D96DCA3389DB</id> @@ -79,7 +79,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -101,7 +101,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 3</description> <id>A31CBE50-87CA-450C-9439-223167B7904D</id> t/htdocs/axkit/out/order_orders_items.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>93B9A497-9FEE-4C87-A204-C822A4959682</id> @@ -79,7 +79,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -101,7 +101,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 4</description> <id>07D7181B-70F4-4F2C-BF10-0C554D0F7A0C</id> t/htdocs/axkit/out/order_orders_items_filtered.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Your order is empty</message> </order> <order> @@ -64,7 +64,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -86,7 +86,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <message>Your order is empty</message> </order> </body> t/htdocs/axkit/out/order_orders_items_filtered_no_results.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 1</description> <id>E72CC2DA-1C87-4A4D-9BD5-99B1D45DB301</id> @@ -95,7 +95,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -117,7 +117,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> <item> <description>Description 3</description> <id>DFDAB889-CB9A-4887-9FFF-7BF4BB81D5B0</id> t/htdocs/axkit/out/order_orders_items_update.xsp.out @@ -20,7 +20,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -42,7 +42,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>0</count> @@ -63,7 +63,7 @@ <billtofax>U3-333-333-3333</billtofax> <billtoemail>Umendlefarg@gmail.com</billtoemail> <comments>UComments</comments> - <created>U20050715T201234Z</created> + <created>2005-07-17T20:12:34</created> <handling>8.96</handling> <number>O123456786</number> <shipmethod>UPS 2nd Day</shipmethod> @@ -85,7 +85,7 @@ <subtotal>37.96</subtotal> <total>37.96</total> <tax>6.67</tax> - <updated>U20050716T201234Z</updated> + <updated>2005-07-18T20:12:34</updated> </order> <order> <count>0</count> @@ -106,7 +106,7 @@ <billtofax>3-333-333-3333</billtofax> <billtoemail>mendlefarg@gmail.com</billtoemail> <comments>Comments</comments> - <created>20050715T201234Z</created> + <created>2005-07-15T20:12:34</created> <handling>8.95</handling> <number>O123456789</number> <shipmethod>UPS Ground</shipmethod> @@ -128,7 +128,7 @@ <subtotal>37.95</subtotal> <total>37.95</total> <tax>6.66</tax> - <updated>20050716T201234Z</updated> + <updated>2005-07-16T20:12:34</updated> </order> <order> <count>0</count> @@ -149,7 +149,7 @@ <billtofax>U3-333-333-3333</billtofax> <billtoemail>Umendlefarg@gmail.com</billtoemail> <comments>UComments</comments> - <created>U20050715T201234Z</created> + <created>2005-07-17T20:12:34</created> <handling>8.96</handling> <number>O123456786</number> <shipmethod>UPS 2nd Day</shipmethod> @@ -171,6 +171,6 @@ <subtotal>37.96</subtotal> <total>37.96</total> <tax>6.67</tax> - <updated>U20050716T201234Z</updated> + <updated>2005-07-18T20:12:34</updated> </order> </body> t/htdocs/axkit/out/order_orders_update.xsp.out @@ -14,17 +14,17 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => '94FE4F12-4C1A-46E4-9DD5-3757555862A8' - })) %] + }).first) %] [% IF (addeditem = cart.add({ description => 'My New Item', id => '9BE94446-ABB8-493D-9C8D-5177901B59D3', @@ -35,10 +35,10 @@ <addeditem> <description>[% addeditem.description %]</description> <id>[% addeditem.id %]</id> - <price>[% addeditem.price %]</price> + <price>[% addeditem.price.value %]</price> <quantity>[% addeditem.quantity %]</quantity> <sku>[% addeditem.sku %]</sku> - <total>[% addeditem.total %]</total> + <total>[% addeditem.total.value %]</total> </addeditem> [% ELSE %] <message>New item not added</message> @@ -49,10 +49,10 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_add.tt2 @@ -23,30 +23,30 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'B0462540-0564-4E27-B9FD-C3985A227C49' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% cart.clear %] + [% CALL cart.clear %] <count>[% cart.count %]</count> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_clear.tt2 @@ -14,7 +14,7 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] t/htdocs/tt2/cart_create.tt2 @@ -19,10 +19,10 @@ <item> <description>[% addeditem.description %]</description> <id>[% addeditem.id %]</id> - <price>[% addeditem.price %]</price> + <price>[% addeditem.price.value %]</price> <quantity>[% addeditem.quantity %]</quantity> <sku>[% addeditem.sku %]</sku> - <total>[% addeditem.total %]</total> + <total>[% addeditem.total.value %]</total> </item> [% ELSE %] <message>Error adding cart item</message> @@ -32,7 +32,7 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] t/htdocs/tt2/cart_create_and_add.tt2 @@ -32,28 +32,28 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'B05779D0-6D40-4F0A-B6A3-1CC2193571C6' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> [% CALL cart.delete({id => '2505E956-D5A6-47B0-AEB5-D19429FCA5FD'}) %] <count>[% cart.count %]</count> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> </cart> [% ELSE %] <message>Could not find cart</message> t/htdocs/tt2/cart_delete.tt2 @@ -1,14 +1,15 @@ [%# $Id$ %] -[% USE hcart = Handel.Cart %] +[% USE hcart = Handel.Cart %] +[% carts = hcart.search %] <body> - [% FOREACH cart = hcart.fetch %] + [% WHILE (cart = carts.next) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% END %] t/htdocs/tt2/cart_fetch.tt2 @@ -1,14 +1,14 @@ [%# $Id$ %] [% USE hcart = Handel.Cart %] <body> - [% IF (cart = hcart.fetch(undef, hcart.RETURNAS_ARRAY)) %] + [% IF (cart = hcart.search.all) %] <cart> <count>[% cart.0.count %]</count> <description>[% cart.0.description %]</description> <id>[% cart.0.id %]</id> <name>[% cart.0.name %]</name> <shopper>[% cart.0.shopper %]</shopper> - <subtotal>[% cart.0.subtotal %]</subtotal> + <subtotal>[% cart.0.subtotal.value %]</subtotal> <type>[% cart.0.type %]</type> </cart> <cart> @@ -17,7 +17,7 @@ <id>[% cart.1.id %]</id> <name>[% cart.1.name %]</name> <shopper>[% cart.1.shopper %]</shopper> - <subtotal>[% cart.1.subtotal %]</subtotal> + <subtotal>[% cart.1.subtotal.value %]</subtotal> <type>[% cart.1.type %]</type> </cart> [% ELSE %] t/htdocs/tt2/cart_fetch_as_array.tt2 @@ -1,7 +1,7 @@ [%# $Id$ %] [% USE hcart = Handel.Cart %] <body> - [% IF (carts = hcart.fetch(undef, hcart.RETURNAS_ITERATOR)) %] + [% IF (carts = hcart.search) %] [% WHILE (cart = carts.next) %] <cart> <count>[% cart.count %]</count> @@ -9,7 +9,7 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% END %] t/htdocs/tt2/cart_fetch_as_iterator.tt2 @@ -1,5 +1,6 @@ [%# $Id$ %] [% USE hcart = Handel.Cart %] + <body> [% UNLESS (cart = hcart.create({ description => 'My New Shopping Cart', @@ -11,20 +12,20 @@ <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_SAVED, id => 'D65692C4-B043-43A7-BFAA-D5326C099B71' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_fetch_filtered.tt2 @@ -4,17 +4,17 @@ [% IF (cart = hcart.fetch({ type => hcart.CART_TYPE_SAVED, id => 'D65692C4-B043-43A7-BFAA-D5326C09C45D' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_fetch_filtered_no_results.tt2 @@ -24,26 +24,27 @@ }) %] [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'E516A609-1905-4C7B-AC82-C33D50DE7AB3' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items %] + [% items = cart.items %] + [% WHILE (item = items.next) %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] </cart> t/htdocs/tt2/cart_items.tt2 @@ -24,34 +24,34 @@ }) %] [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'E516A609-1905-4C7B-AC82-C33D50DE7AB7' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% IF (items = cart.items(undef, hcart.RETURNAS_ARRAY)) %] + [% IF (items = cart.items.all) %] <item> <description>[% items.0.description %]</description> <id>[% items.0.id %]</id> - <price>[% items.0.price %]</price> + <price>[% items.0.price.value %]</price> <quantity>[% items.0.quantity %]</quantity> <sku>[% items.0.sku %]</sku> - <total>[% items.0.total %]</total> + <total>[% items.0.total.value %]</total> </item> <item> <description>[% items.1.description %]</description> <id>[% items.1.id %]</id> - <price>[% items.1.price %]</price> + <price>[% items.1.price.value %]</price> <quantity>[% items.1.quantity %]</quantity> <sku>[% items.1.sku %]</sku> - <total>[% items.1.total %]</total> + <total>[% items.1.total.value %]</total> </item> [% END %] </cart> t/htdocs/tt2/cart_items_as_array.tt2 @@ -24,27 +24,27 @@ }) %] [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'E516A609-1905-4C7B-AC82-C33D50DE7AB9' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% IF (items = cart.items(undef, hcart.RETURNAS_ITERATOR)) %] + [% IF (items = cart.items) %] [% WHILE (item = items.next) %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] [% END %] t/htdocs/tt2/cart_items_as_iterator.tt2 @@ -33,30 +33,31 @@ <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => 'FBC4A843-2667-48ED-AA9F-EF4B52537E72' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items({sku => 'SKU%'}) %] + [% items = cart.items({sku => 'SKU%'}) %] + [% WHILE (item = items.next) %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_items_filtered.tt2 @@ -26,27 +26,28 @@ <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => '89C8C2E3-3170-4E9D-81DC-9E572E102FB8' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% IF (items = cart.items({sku => 'FOO%'})) %] - [% FOREACH item IN items %] + [% items = cart.items({sku => 'FOO%'}) %] + [% IF items.count %] + [% WHILE (item = items.next) %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] [% ELSE %] t/htdocs/tt2/cart_items_filtered_no_results.tt2 @@ -26,26 +26,26 @@ <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_TEMP, id => '6509982B-14B3-4AB0-8DEB-B5160B115521' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items %] + [% FOREACH item = cart.items.all %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% CALL item.description('My Updated Item') %] [% CALL item.price(10.13) %] @@ -54,13 +54,13 @@ <updateditem> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </updateditem> [% END %] - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> </cart> [% ELSE %] <message>Could not find cart</message> t/htdocs/tt2/cart_items_update.tt2 @@ -50,37 +50,37 @@ <message>Error adding cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ id => '76DFA8B1-644A-44C5-B545-7D0BAE09313D' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items %] + [% FOREACH item = cart.items.all %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] [% CALL cart.restore({id => 'CB2787E4-FC6B-48C8-A76D-F64AA9EC48CF'}, hcart.CART_MODE_APPEND) %] <count>[% cart.count %]</count> - <subtotal>[% cart.subtotal %]</subtotal> - [% FOREACH item = cart.items %] + <subtotal>[% cart.subtotal.value %]</subtotal> + [% FOREACH item = cart.items.all %] <restoreditem> <description>[% item.description %]</description> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </restoreditem> [% END %] </cart> t/htdocs/tt2/cart_restore_append.tt2 @@ -50,37 +50,37 @@ <message>Error adding cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ id => '32EAE1FC-FAD1-4C58-8826-5B9064DE0D63' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items %] + [% FOREACH item = cart.items.all %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] [% CALL cart.restore({id => '01B9CE36-B18D-4D30-A860-DB54993D4F80'}, hcart.CART_MODE_MERGE) %] <count>[% cart.count %]</count> - <subtotal>[% cart.subtotal %]</subtotal> - [% FOREACH item = cart.items %] + <subtotal>[% cart.subtotal.value %]</subtotal> + [% FOREACH item = cart.items.all %] <restoreditem> <description>[% item.description %]</description> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </restoreditem> [% END %] </cart> t/htdocs/tt2/cart_restore_merge.tt2 @@ -50,39 +50,39 @@ <message>Error adding cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ id => '6ACAB02E-502D-440A-B4EB-A354E6F0C2D6' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> - [% FOREACH item = cart.items %] + [% FOREACH item = cart.items.all %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] [% CALL cart.restore({id => '8387244B-DB27-4E26-BAD0-F6CB72C37954'}, hcart.CART_MODE_REPLACE) %] <description>[% cart.description %]</description> <name>[% cart.name %]</name> <count>[% cart.count %]</count> - <subtotal>[% cart.subtotal %]</subtotal> - [% FOREACH item = cart.items %] + <subtotal>[% cart.subtotal.value %]</subtotal> + [% FOREACH item = cart.items.all %] <restoreditem> <description>[% item.description %]</description> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </restoreditem> [% END %] </cart> t/htdocs/tt2/cart_restore_replace.tt2 @@ -14,24 +14,24 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ id => '279C429E-547C-4429-9DA9-357659E3F654', type => hcart.CART_TYPE_TEMP - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> [% CALL cart.save %] <type>[% cart.type %]</type> t/htdocs/tt2/cart_save.tt2 @@ -11,17 +11,17 @@ <message>Error creating shopping cart</message> [% END %] - [% IF (cart = hcart.fetch({ + [% IF (cart = hcart.search({ type => hcart.CART_TYPE_SAVED, id => '535FD0DD-A88E-42B0-B503-7FFB4384B4D6' - })) %] + }).first) %] <cart> <count>[% cart.count %]</count> <description>[% cart.description %]</description> <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% CALL cart.description('My New Description') %] @@ -34,10 +34,10 @@ <id>[% cart.id %]</id> <name>[% cart.name %]</name> <shopper>[% cart.shopper %]</shopper> - <subtotal>[% cart.subtotal %]</subtotal> + <subtotal>[% cart.subtotal.value %]</subtotal> <type>[% cart.type %]</type> </cart> [% ELSE %] <message>Could not find cart</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/cart_update.tt2 @@ -2,5 +2,4 @@ [% USE hdlc = Handel.Cart %] <body> <p>[% hdlc.uuid %]</p> - <p>[% hdlc.guid %]</p> </body> t/htdocs/tt2/cart_uuid.tt2 @@ -3,7 +3,7 @@ <body> - [% IF (checkout = hcheckout.create) %] + [% IF (checkout = hcheckout.new) %] [% CALL checkout.add_message('This is a new message') %] <messages> [% FOREACH message = checkout.messages %] t/htdocs/tt2/checkout_messages.tt2 @@ -2,7 +2,7 @@ [% USE hcheckout = Handel.Checkout %] <body> - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ order => '11111111-1111-1111-1111-111111111111' })) %] [% IF (order = checkout.order) %] @@ -26,10 +26,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -44,18 +44,18 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> - [% FOREACH item = order.items.list %] + [% FOREACH item = order.items.all %] <item> <description>[% item.description %]</description> <id>[% item.id %]</id> - <price>[% item.price %]</price> + <price>[% item.price.value %]</price> <quantity>[% item.quantity %]</quantity> <sku>[% item.sku %]</sku> - <total>[% item.total %]</total> + <total>[% item.total.value %]</total> </item> [% END %] </order> t/htdocs/tt2/checkout_order.tt2 @@ -2,7 +2,7 @@ [% USE hcheckout = Handel.Checkout %] <body> - [% IF (checkout = hcheckout.create) %] + [% IF (checkout = hcheckout.new) %] <phases> [% FOREACH phase = checkout.phases %] <phase>[% phase %]</phase> @@ -10,7 +10,7 @@ </phases> [% END %] - [% IF (checkout = hcheckout.create({phases => 'CHECKOUT_PHASE_AUTHORIZE CHECKOUT_PHASE_DELIVER'})) %] + [% IF (checkout = hcheckout.new({phases => 'CHECKOUT_PHASE_AUTHORIZE CHECKOUT_PHASE_DELIVER'})) %] <phases> [% FOREACH phase = checkout.phases %] <phase>[% phase %]</phase> t/htdocs/tt2/checkout_phases.tt2 @@ -2,7 +2,7 @@ [% USE hcheckout = Handel.Checkout %] <body> - [% IF (checkout = hcheckout.create({pluginpaths => 'Handel::TestPlugins'})) %] + [% IF (checkout = hcheckout.new({pluginpaths => 'Handel::TestPlugins'})) %] <plugins> [% FOREACH plugin = checkout.plugins %] <plugin>[% plugin.name %]</plugin> @@ -10,7 +10,7 @@ </plugins> [% END %] - [% IF (checkout = hcheckout.create({pluginpaths => 'Handel::OtherTestPlugins'})) %] + [% IF (checkout = hcheckout.new({pluginpaths => 'Handel::OtherTestPlugins'})) %] <plugins> [% FOREACH plugin = checkout.plugins %] <plugin>[% plugin.name %]</plugin> @@ -18,7 +18,7 @@ </plugins> [% END %] - [% IF (checkout = hcheckout.create({pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins'})) %] + [% IF (checkout = hcheckout.new({pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins'})) %] <plugins> [% FOREACH plugin = checkout.plugins %] <plugin>[% plugin.name %]</plugin> @@ -26,7 +26,7 @@ </plugins> [% END %] - [% IF (checkout = hcheckout.create({pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins, Handel::TestPipeline'})) %] + [% IF (checkout = hcheckout.new({pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins, Handel::TestPipeline'})) %] <plugins> [% FOREACH plugin = checkout.plugins %] <plugin>[% plugin.name %]</plugin> @@ -34,7 +34,7 @@ </plugins> [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins, Handel::TestPipeline', ignoreplugins => 'Handel::TestPipeline::ValidateError' })) %] @@ -46,7 +46,7 @@ [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins, Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::ValidateError' })) %] @@ -57,7 +57,7 @@ </plugins> [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPlugins, Handel::OtherTestPlugins, Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::WriteToStash, Handel::TestPipeline::ReadFromStash', ignoreplugins => 'Handel::TestPipeline::WriteToStash' @@ -68,4 +68,4 @@ [% END %] </plugins> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/checkout_plugins.tt2 @@ -3,7 +3,7 @@ <body> - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::ReadFromStash, Handel::Testpipeline::WriteFromStash', cart => '11111111-1111-1111-1111-111111111111' @@ -20,7 +20,7 @@ </checkout> [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::ReadFromStash, Handel::Testpipeline::WriteFromStash', order => '11111111-1111-1111-1111-111111111111' @@ -37,7 +37,7 @@ </checkout> [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::ReadFromStash, Handel::Testpipeline::WriteFromStash' })) %] @@ -54,7 +54,7 @@ </checkout> [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::ReadFromStash, Handel::Testpipeline::WriteFromStash' })) %] @@ -72,7 +72,7 @@ [% END %] - [% IF (checkout = hcheckout.create({ + [% IF (checkout = hcheckout.new({ pluginpaths => 'Handel::TestPipeline', loadplugins => 'Handel::TestPipeline::InitializeTotals, Handel::TestPipeline::ValidateError', order => '11111111-1111-1111-1111-111111111111', t/htdocs/tt2/checkout_process.tt2 @@ -19,7 +19,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -41,7 +41,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] <order> <count>[% order.count %]</count> @@ -63,10 +63,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -81,19 +81,19 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] <message>Error creating order</message> [% END %] - [% IF (order = horder.fetch({ + [% IF (order = horder.search({ type => horder.ORDER_TYPE_TEMP, id => '94FE4F12-4C1A-46E4-9DD5-3757555862A8' - })) %] + }).first) %] [% IF (addeditem = order.add({ description => 'My New Item', id => '9BE94446-ABB8-493D-9C8D-5177901B59D3', @@ -105,10 +105,10 @@ <addeditem> <description>[% addeditem.description %]</description> <id>[% addeditem.id %]</id> - <price>[% addeditem.price %]</price> + <price>[% addeditem.price.value %]</price> <quantity>[% addeditem.quantity %]</quantity> <sku>[% addeditem.sku %]</sku> - <total>[% addeditem.total %]</total> + <total>[% addeditem.total.value %]</total> </addeditem> [% ELSE %] <message>New item not added</message> @@ -133,10 +133,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -151,12 +151,12 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] <message>Could not find order</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/order_add.tt2 @@ -19,7 +19,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -41,7 +41,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] [% UNLESS order.add({ description => 'My New Item', @@ -73,10 +73,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -91,19 +91,19 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] <message>Error creating order</message> [% END %] - [% IF (order = horder.fetch({ + [% IF (order = horder.search({ type => horder.ORDER_TYPE_TEMP, id => 'B0462540-0564-4E27-B9FD-C3985A227C49' - })) %] + }).first) %] <order> <count>[% order.count %]</count> <id>[% order.id %]</id> @@ -124,10 +124,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -142,14 +142,14 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> - [% order.clear %] + [% CALL order.clear %] <count>[% order.count %]</count> </order> [% ELSE %] <message>Could not find order</message> [% END %] -</body> \ No newline at end of file +</body> t/htdocs/tt2/order_clear.tt2 @@ -1,5 +1,5 @@ [%# $Id$ %] -[% USE horder = Handel.Order %] +[% USE horder = Handel.Order %] <body> [% IF (order = horder.create({ id => '7B1A38C8-36CA-4403-B3D4-C7D327131F37', @@ -19,7 +19,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -41,7 +41,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] <order> <count>[% order.count %]</count> @@ -63,10 +63,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -81,9 +81,9 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] t/htdocs/tt2/order_create.tt2 @@ -19,7 +19,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -41,7 +41,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] <order> [% IF (addeditem = order.add({ @@ -55,10 +55,10 @@ <item> <description>[% addeditem.description %]</description> <id>[% addeditem.id %]</id> - <price>[% addeditem.price %]</price> + <price>[% addeditem.price.value %]</price> <quantity>[% addeditem.quantity %]</quantity> <sku>[% addeditem.sku %]</sku> - <total>[% addeditem.total %]</total> + <total>[% addeditem.total.value %]</total> </item> [% ELSE %] <message>Error adding order item</message> @@ -82,10 +82,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -100,9 +100,9 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] t/htdocs/tt2/order_create_and_add.tt2 @@ -3,7 +3,7 @@ <body> [% IF (order = horder.create({ id => '7B1A38C8-36CA-4403-B3D4-C7D327131F3C', - shopper => 'D7B1057E-6998-4813-9F97-702C405DFB9C', + shopper => 'D7B1057E-6998-4813-9F97-702C405DFB9C', type => horder.ORDER_TYPE_TEMP, cart => {type => horder.CART_TYPE_TEMP, id => '11111111-1111-1111-1111-111111111111'}, billtofirstname => 'Christopher', @@ -20,7 +20,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -42,7 +42,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] <order> <count>[% order.count %]</count> @@ -64,10 +64,10 @@ <billtoemail>[% order.billtoemail %]</billtoemail> <comments>[% order.comments %]</comments> <created>[% order.created %]</created> - <handling>[% order.handling %]</handling> + <handling>[% order.handling.value %]</handling> <number>[% order.number %]</number> <shipmethod>[% order.shipmethod %]</shipmethod> - <shipping>[% order.shipping %]</shipping> + <shipping>[% order.shipping.value %]</shipping> <shiptosameasbillto>[% order.shiptosameasbillto %]</shiptosameasbillto> <shiptofirstname>[% order.shiptofirstname %]</shiptofirstname> <shiptolastname>[% order.shiptolastname %]</shiptolastname> @@ -82,9 +82,9 @@ <shiptonightphone>[% order.shiptonightphone %]</shiptonightphone> <shiptofax>[% order.shiptofax %]</shiptofax> <shiptoemail>[% order.shiptoemail %]</shiptoemail> - <subtotal>[% order.subtotal %]</subtotal> - <total>[% order.total %]</total> - <tax>[% order.tax %]</tax> + <subtotal>[% order.subtotal.value %]</subtotal> + <total>[% order.total.value %]</total> + <tax>[% order.tax.value %]</tax> <updated>[% order.updated %]</updated> </order> [% ELSE %] t/htdocs/tt2/order_create_cart.tt2 @@ -19,7 +19,7 @@ billtofax => '3-333-333-3333', billtoemail => 'mendlefarg@gmail.com', comments => 'Comments', - created => '20050715T201234Z', + created => '2005-07-15 20:12:34', handling => 8.95, number => 'O123456789', shipmethod => 'UPS Ground', @@ -41,7 +41,7 @@ subtotal => 37.95, total => 37.95, tax => 6.66, - updated => '20050716T201234Z' + updated => '2005-07-16 20:12:34' })) %] [% UNLESS order.add({ description => 'My New Item', @@ -83,10 +83,10 @@ <bi