lib/Mango/Catalyst/Checkout/Plugins/Edit.pm share/forms/checkout/edit.yml @@ -2,6 +2,8 @@ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>currentDocument</key> + <string>lib/Mango/Catalyst/Controller/Checkout.pm</string> <key>documents</key> <array> <dict> @@ -19,6 +21,92 @@ <integer>311</integer> <key>metaData</key> <dict> + <key>lib/Mango/Catalyst/Checkout/Plugins/Edit.pm</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>8</integer> + <key>line</key> + <integer>19</integer> + </dict> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + </dict> + <key>lib/Mango/Catalyst/Checkout/Plugins/Initialize.pm</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>32</integer> + <key>line</key> + <integer>13</integer> + </dict> + <key>columnSelection</key> + <false/> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + <key>selectFrom</key> + <dict> + <key>column</key> + <integer>23</integer> + <key>line</key> + <integer>13</integer> + </dict> + <key>selectTo</key> + <dict> + <key>column</key> + <integer>48</integer> + <key>line</key> + <integer>13</integer> + </dict> + </dict> + <key>lib/Mango/Catalyst/Controller/Checkout.pm</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>55</integer> + <key>line</key> + <integer>47</integer> + </dict> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>21</integer> + </dict> + <key>lib/Mango/Checkout.pm</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>0</integer> + <key>line</key> + <integer>12</integer> + </dict> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + </dict> + <key>share/forms/checkout/edit.yml</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>0</integer> + <key>line</key> + <integer>29</integer> + </dict> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + </dict> <key>t/pod_syntax.t</key> <dict> <key>caret</key> @@ -34,9 +122,17 @@ <integer>0</integer> </dict> </dict> + <key>openDocuments</key> + <array> + <string>lib/Mango/Catalyst/Controller/Checkout.pm</string> + <string>lib/Mango/Checkout.pm</string> + <string>share/forms/checkout/edit.yml</string> + <string>lib/Mango/Catalyst/Checkout/Plugins/Initialize.pm</string> + <string>lib/Mango/Catalyst/Checkout/Plugins/Edit.pm</string> + </array> <key>showFileHierarchyDrawer</key> <true/> <key>windowFrame</key> - <string>{{931, 28}, {979, 1143}}</string> + <string>{{336, 235}, {1228, 940}}</string> </dict> </plist> Mango.tmproj @@ -317,6 +317,9 @@ sub mk_controllers { file( $c, 'Admin', 'Products', 'Attributes.pm' ) ); + ## checkout + $self->render_file( 'controller_checkout', file( $c, 'Checkout.pm' ) ); + ## current user $self->mk_dir( dir( $c, 'Cart' ) ); $self->mk_dir( dir( $c, 'Wishlists' ) ); @@ -505,6 +508,16 @@ BEGIN { }; 1; +__controller_checkout__ +package [% name %]::Controller::Checkout; +use strict; +use warnings; + +BEGIN { + use base qw/Mango::Catalyst::Controller::Checkout/; +}; + +1; __controller_cart__ package [% name %]::Controller::Cart; use strict; lib/Catalyst/Helper/Mango.pm @@ -11,7 +11,7 @@ BEGIN { sub register { my ( $self, $ctx ) = @_; - $ctx->add_handler( CHECKOUT_PHASE_INITIALIZE, \&initialize, 100 ); + $ctx->add_handler( 'INITIALIZE', \&initialize, 100 ); return; } @@ -22,6 +22,9 @@ sub initialize { my $c = $ctx->stash->{'c'}; my $profile = $c->user->profile; + use Carp (); + Carp::carp 'INIT FROM MANGO CAT PLUGIN'; + ## this sohuld really be in core $order->billtofirstname( $profile->first_name ); $order->billtolastname( $profile->last_name ); lib/Mango/Catalyst/Checkout/Plugins/Initialize.pm @@ -11,14 +11,6 @@ BEGIN { extends 'Class::Workflow::State::Simple'; } -sub BUILD { - my ( $self, $hash ) = @_; - - $self->checkout($hash); - - return; -} - subtype 'Checkout' => as 'Object' => where { $_->isa('Mango::Checkout') }; coerce 'Checkout' => from 'HashRef' => via { Mango::Checkout->new($_) }; lib/Mango/Catalyst/Checkout/Workflow/State.pm @@ -68,7 +68,7 @@ __END__ =head1 NAME -Mango::Catalyst::Controller::Carts::Items - Catalyst controller for cart item information +Mango::Catalyst::Controller::Cart::Items - Catalyst controller for cart item information =head1 SYNOPSIS lib/Mango/Catalyst/Controller/Cart/Items.pm @@ -24,13 +24,17 @@ BEGIN { states => [ { name => 'preview_GET', - phases => [qw/CHECKOUT_PHASE_PREVIEW/], - loadplugins => [qw/Plugin::GetShippingOptions/], + checkout => { + phases => [qw/PREVIEW/], + loadplugins => [qw/Plugin::GetShippingOptions/] + } }, { name => 'preview_POST', - phases => [qw/CHECKOUT_PHASE_PREVIEW/], - loadplugins => [qw/Plugin::ApplyShipping/], + checkout => { + phases => [qw/PREVIEW/], + loadplugins => [qw/Plugin::ApplyShipping/] + }, transitions => [ { name => 'edit', @@ -38,11 +42,19 @@ BEGIN { } ], }, - { name => 'edit_GET' }, + { + name => 'edit_GET', + checkout => { + phases => ['EDIT'], + loadplugins => [qw/Mango::Catalyst::Checkout::Plugins::Edit/] + } + }, { name => 'edit_POST', - phases => [qw/CHECKOUT_PHASE_EDIT/], - loadplugins => [qw/Plugin::ScrubAddress/], + checkout => { + phases => [qw/EDIT/], + loadplugins => [qw/Plugin::ScrubAddress/] + }, transitions => [ { name => 'preview', @@ -107,14 +119,19 @@ sub instance : Chained('/') PathPrefix Args(1) Template('checkout/index') { $c->stash->{'template'} = $state->template || 'checkout/' . $state->short_name; + $c->stash->{'form'} = $self->form($state->short_name); + my $checkout = $state->checkout; $checkout->order( $self->order ); $checkout->stash( $c->stash ); - +warn $checkout->phases; +warn $checkout->plugins; if ( $checkout->process != Handel::Constants::CHECKOUT_STATUS_OK ) { + warn "ERRORS"; $c->stash->{'errors'} = $checkout->messages; } else { + warn "OK"; $checkout->order->update; } @@ -149,7 +166,7 @@ sub initialize { my $checkout = Mango::Checkout->new( { order => $order, - phases => 'CHECKOUT_PHASE_INITIALIZE', + phases => ['INITIALIZE'], stash => $c->stash } ); lib/Mango/Catalyst/Controller/Checkout.pm @@ -179,6 +179,7 @@ sub _parse_fields { $type =~ s/password/Password/i; $type =~ s/select/Select/i; $type =~ s/checkbox/Checkbox/i; + $type =~ s/fieldset/Fieldset/i; if ( $type eq 'Checkbox' && exists $field->{'multiple'} @@ -186,7 +187,7 @@ sub _parse_fields { { $type = 'Checkboxgroup'; } - if ( $type ne 'Submit' ) { + if ( $type !~ /Submit|Fieldset/i ) { if ( !exists $field->{'label'} && !exists $field->{'label_loc'} && !exists $field->{'label_xml'} ) @@ -196,8 +197,12 @@ sub _parse_fields { } ## migrate disabled - $field->{'force_default'} = delete $field->{'force'}; - $field->{'retain_default'} = $field->{'force_default'}; + if (exists $field->{'force'}) { + $field->{'force_default'} = delete $field->{'force'}; + } + if (exists $field->{'force_default'}) { + $field->{'retain_default'} = $field->{'force_default'}; + } if ( exists $field->{'disabled'} ) { $field->{'attributes'}->{'disabled'} = delete $field->{'disabled'}; lib/Mango/Form.pm @@ -1,6 +1 @@ -[% form.render %] - - -<form method="post"> -<input type="submit" value="POST" /> -</form> \ No newline at end of file +[% form.render %] \ No newline at end of file share/templates/tt/html/checkout/edit bb21210cace4f65e6b0264b7968200019a157c4c claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc http://github.com/claco/mango/commit/33a47b530e4db12e0eb528ab6ee01c0d823c702f 33a47b530e4db12e0eb528ab6ee01c0d823c702f 2008-06-13T19:45:43-07:00 2008-06-13T19:45:43-07:00 r1677@mbp: claco | 2008-06-13 22:48:44 -0400 Finally cleaned up phase names as strings after tweaking Handel git-svn-id: http://svn.icantfocus.com/CPAN/Mango/trunk@2191 52a70e3a-55ec-0310-b14e-7917f69ecacc 63211541abcc7fe935e568bc532071340487ff98 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc