From 0ee4a7fa90b917eef2bbf7d4fc6196a60bb3d708 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 19 Oct 2009 15:21:39 -0700 Subject: [PATCH] Make display of failed transactions more obvious in the Account/Shop plugin. --- ...collateral-items_my-purchases-default.wgpkg | Bin 0 -> 1641 bytes ...ral-items_my-purchases-detail-default.wgpkg | Bin 0 -> 2767 bytes lib/WebGUI/Shop/TransactionItem.pm | 7 ++++--- lib/WebGUI/i18n/English/Shop.pm | 17 +++++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-default.wgpkg create mode 100644 docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-detail-default.wgpkg diff --git a/docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-default.wgpkg b/docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-default.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..2e7f0681958bf70ad4052071f0ace631c6c92e6f GIT binary patch literal 1641 zcmV-v2A26BiwFP!00000|Ls^&Z`(Ey&U1f-;9^4y)Ujkcb}V}V(l%~_CRxxV>wtMJ zXo;4%N~A_ocHAKUeMd^NC|gc5Ai?$!35g8e>F)UP?mJSuJ5PVvw%zaV?d+&$udAO< z7oOJYvUeP(-Rn91zHK`@mgCrMc)%-9f2Beq4xxE0BJ|sKf2qJ+Y!|D^!KEjspZBQ# zpF}!pr~Kd9*T467{}PNoQlMb5m#=%x`a5>F*IrxyZl~SZu>j4dzn*IScb`7=$MA6b z0*bI9ahya*;;%?bnIGs=?3G1&3nE|qSh z)6nlLL4<@nx=9!Z>7jmyrctyKLlsJGzmcTVh=>sT<+~IwJ`?J*g*IxJ042v_2nqi!v}e_jxiJ0o1krWcaPzir0sJD{TdapaR!G+}n9%CnxK5lT}7 z?ovka55QASRFd55$6T(L zMy)8N2Ov|enPM9El#Zp-x)OrQCo{Jn?z*g``#om`RpWZ2t{&>!FC1>JSYBq8DQ+#c zidId@RpeU=ucBkFXIXxkN+o@u9@HqTaZ!#FS{5V{0?WJ@+kqU*zGwe^I6lAby#4Ss zouAKxQa9z1u1gWJBmv@XdWZwTu}C#rj-n=zKrCAEvYF(~M>KsrLun*SBSah%-^Wy2 za?J4y&LmU4OpA=ZsG3J|;ve}$YLP)2MXT52BcIGI4{}97H!M3K^g{)}DD13+x*@{& zmlFz+Q>1zxieAM_YZdvMOPJ;Bq4jeN;W9b2zMxl=#wRROPA$o-L(hYjCMS*8!%-{j zC>P3!L{sRxa2 z=P{33pr)d!eF4QP?gy#*u&!0b;*3)h$R+G~Qc+ch09rB&UIkT7Xv+L$J~!B_eT^7P zECVdDF>n81gshO`89+3W>YX{_)|}wQdn^%&u6c9-3tEaaF6SDSgHa2?pUluypn$cN zjSP?Nas|S#vtm0{=#@Yew#dvP;xhF-EW|90*4HVQ6!>WOI1+eWZw!;cexcUVdSq6( ztpZv=m!Z{?C8{l*hcG^BK~ccdC^Q;kP9y*}<}AKI9Ja^n6{q*F??Oa_+RZPaINv`v zY<1O~xJrMz7S2(emGx&l{cwHax`&E)T=y#9s+a1D>d%-@W+dO_I_#KWq=9duv5}Lw!r4P$5&^kn;;T#%G4<# zJGfMiCPd^Qtxw8ab1fST`h&qs zth|DgWqDL6e)Cf;i z?l2!kie=JZ>hWbFFKTjDq9ETLoqp)p-v^)4EW&wa^@AzuoP2jG6#`0PfDiL+5coZO`w?$dBJSyBBwl@zv$o#xnxX2s|V3-y`r3(KK7=02%-QT#z(= literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-detail-default.wgpkg b/docs/upgrades/packages-7.8.2/shopping-cart-collateral-items_my-purchases-detail-default.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..e0261ffe51cdd44b16b3a6ffeec3958916ff1186 GIT binary patch literal 2767 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 literal 0 HcmV?d00001 diff --git a/lib/WebGUI/Shop/TransactionItem.pm b/lib/WebGUI/Shop/TransactionItem.pm index da0a4b321..97aa66abc 100644 --- a/lib/WebGUI/Shop/TransactionItem.pm +++ b/lib/WebGUI/Shop/TransactionItem.pm @@ -265,7 +265,8 @@ The status of this item. The default is 'NotShipped'. Other statuses include: Ca sub update { my ($self, $newProperties) = @_; my $id = id $self; - my $session = $self->transaction->session; + my $transaction = $self->transaction; + my $session = $transaction->session; my $taxDriver = WebGUI::Shop::Tax->getDriver( $session ); if (exists $newProperties->{item}) { @@ -296,7 +297,7 @@ sub update { $newProperties->{ taxConfiguration } = to_json( $taxDriver->getTransactionTaxData( $sku, $address ) || '{}' ); - unless ($sku->isShippingRequired) { + if (!$sku->isShippingRequired && $transaction->get('isSuccessful')) { $newProperties->{orderStatus} = 'Shipped'; } } @@ -310,7 +311,7 @@ sub update { if (exists $newProperties->{options} && ref($newProperties->{options}) eq "HASH") { $properties{$id}{options} = JSON->new->encode($newProperties->{options}); } - $properties{$id}{lastUpdated} = WebGUI::DateTime->new($self->transaction->session,time())->toDatabase; + $properties{$id}{lastUpdated} = WebGUI::DateTime->new($session,time())->toDatabase; $self->transaction->session->db->setRow("transactionItem","itemId",$properties{$id}); } diff --git a/lib/WebGUI/i18n/English/Shop.pm b/lib/WebGUI/i18n/English/Shop.pm index 7b0f30d32..018dd39cc 100644 --- a/lib/WebGUI/i18n/English/Shop.pm +++ b/lib/WebGUI/i18n/English/Shop.pm @@ -621,6 +621,12 @@ our $I18N = { context => q|field label| }, + 'Status' => { + message => q|Status|, + lastUpdated => 0, + context => q|Whether a transaction was successful, or not.| + }, + 'payment method' => { message => q|Payment Method|, lastUpdated => 0, @@ -1695,6 +1701,17 @@ our $I18N = { context => q|commerce setting help| }, + 'Success' => { + message => q|Success|, + lastUpdated => 0, + context => q|commerce setting help| + }, + + 'Failed' => { + message => q|Failure|, + lastUpdated => 0, + context => q|commerce setting help| + }, };