[interchange-cvs] interchange - heins modified 7 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Oct 18 02:01:02 2002
User: heins
Date: 2002-10-18 06:00:10 GMT
Modified: code/UI_Tag update_order_status.tag
Modified: dist/foundation/etc log_transaction
Modified: dist/foundation/products mv_metadata.asc
Modified: dist/foundation/templates/sampledata/tools/products
Modified: transactions.txt
Modified: dist/lib/UI/pages/admin order.html order_status.html
Modified: spread.html
Log:
Various minor changes to order status setup.
* Add JavaScript for supported browsers to do batch checking functions
* Couple buttons on update form together.
* Change text of "OK" button on order_status.html so people won't think
OK means ship the order.
* Check all shipped, Check all pending, etc. buttons
* Fix text_qualification in spreadsheet.
* Add metadata for enter tracking number view.
* Put more reasonable dates in transactions file.
Revision Changes Path
1.3 +9 -4 interchange/code/UI_Tag/update_order_status.tag
rev 1.3, prev_rev 1.2
Index: update_order_status.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/code/UI_Tag/update_order_status.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update_order_status.tag 18 Oct 2002 03:05:51 -0000 1.2
+++ update_order_status.tag 18 Oct 2002 06:00:10 -0000 1.3
@@ -1,6 +1,6 @@
UserTag update-order-status Order order_number
UserTag update-order-status addAttr
-UserTag update-order-status Version $Id: update_order_status.tag,v 1.2 200=
2/10/18 03:05:51 mheins Exp $
+UserTag update-order-status Version $Id: update_order_status.tag,v 1.3 200=
2/10/18 06:00:10 mheins Exp $
UserTag update-order-status Routine <<EOR
sub {
my ($on, $opt) =3D @_;
@@ -27,6 +27,7 @@
for(qw/
settle_transaction
void_transaction
+ cancel_order
status
do_archive
archive
@@ -38,6 +39,11 @@
$opt->{$_} =3D $CGI::values{$_} if ! defined $opt->{$_};
}
=20
+ if($opt->{ship_all} =3D=3D 2 or $opt->{void_transaction} or $opt->{cancel=
_order}) {
+ $opt->{cancel_order} =3D 1;
+ $opt->{ship_all} =3D 2;
+ }
+
$opt->{archive} ||=3D $opt->{do_archive};
=20
$wants_copy =3D $opt->{send_email} if length $opt->{send_email};
@@ -103,7 +109,6 @@
}
}
elsif($opt->{void_transaction}) {
- $opt->{ship_all} =3D 1;
my $oid =3D $trec->{order_id};
$oid =3D~ s/\*$//;
my $amount =3D $trec->{total_cost};
@@ -198,7 +203,7 @@
my %shipping;
my %already;
=20
- my $target_status =3D $opt->{void_transaction} ? 'canceled' : 'shipped';
+ my $target_status =3D $opt->{cancel_order} ? 'canceled' : 'shipped';
=20
for(@$lines_ary) {
my $code =3D $_->[$odb_keypos];
@@ -206,7 +211,7 @@
my $line =3D $code;
$line =3D~ s/.*\D//;
$line =3D~ s/^0+//;
- if($status eq $target_status and ! $opt->{void_transaction}) {
+ if($status eq $target_status and ! $opt->{cancel_order}) {
$already{$line} =3D 1;
}
elsif($opt->{ship_all}) {
@@ -260,7 +265,7 @@
=20
delete $::Scratch->{ship_now_complete};
=20=09
- if($opt->{void_transaction}) {
+ if($opt->{cancel_order}) {
$g_status =3D 'canceled';
$ship_mesg =3D "Order $on canceled.";
}
2.6 +1 -0 interchange/dist/foundation/etc/log_transaction
rev 2.6, prev_rev 2.5
Index: log_transaction
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/etc/log_transaction,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- log_transaction 17 Oct 2002 04:46:23 -0000 2.5
+++ log_transaction 18 Oct 2002 06:00:10 -0000 2.6
@@ -173,6 +173,7 @@
payment_mode: [data session payment_mode]
order_id: [data session payment_id]
auth_code: [calc] ($Session->{payment_result} || {})->{'pop.auth-code'}; [=
/calc]
+tracking_number:
order_date: [value name=3Dorder_date set=3D"[tag time]%Y%m%d %H:%M:%S[/tag=
]"]
order_ymd: [value name=3Dorder_date set=3D"[tag time]%Y%m%d[/tag]"]
order_wday: [value name=3Dorder_wday set=3D"[tag time]%u[/tag]"]
2.19 +1 -0 interchange/dist/foundation/products/mv_metadata.asc
rev 2.19, prev_rev 2.18
Index: mv_metadata.asc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/products/mv_metadata.asc,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -r2.18 -r2.19
--- mv_metadata.asc 17 Oct 2002 04:46:23 -0000 2.18
+++ mv_metadata.asc 18 Oct 2002 06:00:10 -0000 2.19
@@ -196,6 +196,7 @@
shipping text description=09=09=09=09=09=09=09=09=09=09=09=09=09=09=09=
=09=09
state code=0Dcountry=0Dstate=0Dname=0Dtax=0Dtax_name State/Province Se=
ttings (tax, etc)=09=09=09=09=09=09=09=09=09=09=09=09=09=09=09
state::state text 4 word=09=09=09=09=09=09=09=09
+tracking::transactions {'bottom_buttons' =3D> "",'spre=
ad_textarea' =3D> "",'tab_vert_offset' =3D> "",'widget_cell_class' =3D> "",=
'ui_sort_field' =3D> "tracking_number",'link_table' =3D> "",'ui_show_fields=
' =3D> "",'link_extra' =3D> "",'break_row_class' =3D> "",'label_cell_class'=
=3D> "",'tab_horiz_offset' =3D> "",'link_before' =3D> "",'ui_special_add' =
=3D> "",'top_buttons' =3D> "",'left_width' =3D> "",'spread_fields' =3D> "co=
de=0Dlname=0Dcity=0Dstate=0Dcountry=0Dtracking_number",'combo_row_class' =
=3D> "",'include_before' =3D> "",'ui_meta_specific' =3D> "",'tab_height' =
=3D> "",'link_view' =3D> "",'link_fields' =3D> "",'spread_meta' =3D> "track=
ing_number",'tab_width' =3D> "",'data_row_class' =3D> "",'ui_sort_option' =
=3D> "",'panel_height' =3D> "",'include_form' =3D> "",'help_cell_class' =3D=
> "",'spacer_row_class' =3D> "",'ui_data_fields' =3D> "",'ui_sort_combined'=
=3D> "",'spread_width' =3D> "",'file_upload' =3D> "",'spread_height' =3D> =
"50",'tabbed' =3D> "",'table_width' =3D> "",'spread_textarea_rows' =3D> "",=
'link_sort' =3D> "",'panel_width' =3D> "",'link_key' =3D> "",'data_cell_cla=
ss' =3D> "",'link_label' =3D> "",}
transactions 100 1 {'bottom_buttons' =3D> "",'tab_vert_o=
ffset' =3D> "",'spread_textarea' =3D> "",'widget_cell_class' =3D> "",'ui_so=
rt_field' =3D> "order_number",'link_table' =3D> "orderline",'ui_show_fields=
' =3D> "code=0Dusername=0Dnitems=0Dtotal_cost",'link_extra' =3D> "",'break_=
row_class' =3D> "",'label_cell_class' =3D> "",'tab_horiz_offset' =3D> "",'l=
ink_before' =3D> "nitems",'ui_special_add' =3D> "",'left_width' =3D> "120",=
'top_buttons' =3D> "",'include_before' =3D> "total_cost",'combo_row_class' =
=3D> "",'spread_fields' =3D> "",'tab_height' =3D> "",'link_view' =3D> "",'l=
ink_fields' =3D> "code order_number sku quantity description price subtotal=
",'spread_meta' =3D> "",'data_row_class' =3D> "",'tab_width' =3D> "",'panel=
_height' =3D> "",'include_form' =3D> "<td class=3Dclabel>=0D =
Recompute?=0D </td>=0D <td c=
lass=3Dcdata>=0D <input type=3Dcheckbox name=3Dmv_cl=
eanup value=3Drecompute_transaction> Totals <input type=3Dchec=
kbox name=3Drecompute_tax value=3D1> Tax <B>Warning: this will=
not work if your prices depend on options and you change them!=0D =
</td>=0D",'help_cell_class' =3D> "",'spacer_row_class' =3D> "",'=
ui_data_fields' =3D> "=3DTransaction info=0D=0Dorder_number =0Dorder_date=
=0Dstatus=0Dnitems=0Dsubtotal=0Dsalestax=0Dshipping=0Dhandling=0Dtotal_cost=
=0Dupdate_date=0D=0D=3DGeneral=0D=0Dcode=0Dstore_id=0Dusername=0Dcomments=
=0Dorder_ymd=0Dorder_wday=0Darchived=0Ddeleted=0Dcomplete=0Dshipmode=0Dpaym=
ent_method=0Davs=0Dpo_number=0Dorder_id=0D=0D=3DShipping=0D=0Dfname=0Dlname=
=0Dcompany=0Daddress1=0Daddress2=0Dcity=0Dstate=0Dzip=0Dcountry=0Dphone_day=
=0Dphone_night=0Dfax=0Demail=0D=0D=3DBilling=0D=0Db_fname=0Db_lname=0Db_com=
pany=0Db_address1=0Db_address2=0Db_city=0Db_state=0Db_zip=0Db_country=0Db_p=
hone=0D=0D=3DTracking info=0D=0Daffiliate=0Dcampaign=0Dcurrency_locale=0Dpa=
rent",'file_upload' =3D> "",'spread_width' =3D> "",'tabbed' =3D> "1",'sprea=
d_height' =3D> "",'table_width' =3D> "800",'spread_textarea_rows' =3D> "",'=
link_sort' =3D> "code",'panel_width' =3D> "",'link_key' =3D> "order_number"=
,'data_cell_class' =3D> "",'link_label' =3D> "Ordered Items",}
transactions::archived yesno Archived=09=09=09=09=09=09=09=09=09=
=09=09
transactions::auth_code text 16 Authorization=09=09=09=09=09=09=09=
=09=09=09=09
2.5 +15 -15 interchange/dist/foundation/templates/sampledata/tools=
/products/transactions.txt
rev 2.5, prev_rev 2.4
Index: transactions.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/foundation/templates/sampledata/tools/p=
roducts/transactions.txt,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- transactions.txt 17 Oct 2002 04:46:23 -0000 2.4
+++ transactions.txt 18 Oct 2002 06:00:10 -0000 2.5
@@ -1,16 +1,16 @@
code store_id order_number session__MVC_FIELDMUNGE__ username shipmode nit=
ems subtotal shipping handling salestax total_cost fname lname company addr=
ess1 address2 city state zip country phone_day phone_night fax email b_fnam=
e b_lname b_company b_address1 b_address2 b_city b_state b_zip b_country b_=
phone order_date order_ymd order_wday payment_method po_number avs order_id=
auth_code update_date status tracking_number affiliate campaign parent arc=
hived deleted complete comments currency_locale
-00001 00001 AhGiHXgR T00001 upsg (UPS Ground) 1 19.99 5.73 0 0 25.72 Uebe=
r Mensch 16 Hauptstrasse Portland OR 97201 US 503-555-1212 devnull@icde=
vgroup.net 20001006 11:35:39 20001006 5 Credit Card (visa) __=
MVC_SQLUDATE__ shipped 1 0 0
-00002 00002 AhGiHXgR ckirk upsg (UPS Ground) 27 641.73 15.06 0 41.71 698.=
5 Charles Kirk Auto Exchange Express 123 Exchange Dr. Seattle WA 34987 US =
360-111-1234 360-111-1244 kirk@icdevgroup.net 20001006 11:37:01 =
20001006 5 Credit Card (visa) __MVC_SQLUDATE__ backorder 0
-00003 00003 AhGiHXgR jking upsg (UPS Ground) 150 1948.5 61.01 0 116.91 21=
26.42 John King Car Parts, Inc. 123 Auto Blvd. Miami FL 39807 US 305-111-1=
234 305-111-1239 king@icdevgroup.net 20001006 11:39:36 20001006 =
5 Credit Card (visa) __MVC_SQLUDATE__ shipped 1 0 0
-00004 00004 AhGiHXgR ladams upsg (UPS Ground) 27 257.89 11.13 0 15.47 284=
49 Louis Adams Electronics Inc. 123 California Street Los Angeles CA 7890=
2 US 714-111-1234 714-111-1235 adams@icdevgroup.net 20001006 11:=
40:39 20001006 5 Credit Card (visa) __MVC_SQLUDATE__ credit 0
-00005 00005 AhGiHXgR lriley upsg (UPS Ground) 17 164.83 6.9 6.59 178.32 =
Larry Riley Computerz Inc. 123 Monitor Rd. New York NY 46890 US 518-111-12=
34 518-111-1242 riley@icdevgroup.net 20001006 11:42:01 20001006 =
5 Credit Card (visa) __MVC_SQLUDATE__ partial hardhat
-00006 00006 AhGiHXgR T00002 upsr (UPS Next Day) 1 29.99 0 0 0 29.99 Bobby=
Bodega Computerz Inc. 9500 W. Covina Valdez AK 99686 US 907-111-1234 mi=
lton@icdevgroup.net 20001006 11:44:34 20001006 5 Credit Card (vis=
a) __MVC_SQLUDATE__ pending 0 0 0
-00007 00007 AhGiHXgR mcarter upsg (UPS Ground) 2 89.98 9.84 0 4.50 104.32=
Michele Carter Spare Parts, Inc. 123 Parts Ctr Blvd. Annapolis MD 32498 U=
S 301-111-1234 703-111-1241 carter@icdevgroup.net 20001006 12:07=
:52 20001006 5 Credit Card (visa) __MVC_SQLUDATE__ shipped 1 0 0
-00008 00008 AhGiHXgR mkeller upsg (UPS Ground) 3 53.97 5.17 0 0 59.14 Mic=
hael Keller InfoMed, Inc. 123 Oak St. Portland OR 45098 US 541-111-1234 54=
1-111-1240 keller@icdevgroup.net 20001006 12:08:36 20001006 5 Cr=
edit Card (visa) __MVC_SQLUDATE__ pending 0 0 0
-00009 00009 AhGiHXgR mmichaels upsg (UPS Ground) 100 100 0 0 6.3 106.3 Mi=
chael Michaels Medical Supplies Co. 123 South Street Austin TX 30987 US 51=
2-111-9876 512-111-1237 michael@icdevgroup.net 20001006 12:09:48=
20001006 5 Credit Card (visa) __MVC_SQLUDATE__ shipped 0 0 0
-00010 00010 AhGiHXgR tlucas upsg (UPS Ground) 5 57.95 6.43 0 2.90 67.28 T=
homas Lucas Construct Buildings Inc. 123 Building Dr. Phoenix AZ 56987 US =
520-111-1234 520-111-1245 lucas@icdevgroup.net 20001006 12:10:47=
20001006 5 Credit Card (visa) __MVC_SQLUDATE__ canceled 0
-00011 00011 AhGiHXgR jrollins upsg (UPS Ground) 1 44.99 6.87 0 1.57 53.43=
Joseph Rollins Expert Repair, Inc. 123 Area Rd. Richmond VA 22398 US 804-=
111-1234 804-111-1243 Rollins@icdevgroup.net 20001006 12:11:34 2=
0001006 5 Credit Card (visa) __MVC_SQLUDATE__ pending 0 0 0
-00012 00012 AhGiHXgR ssmith upsg (UPS Ground) 1 18.99 5.61 24.6 Steve S=
mith Pharm Supplies, Inc. 456 Hopkins Ave Washington DC 20090 US 202-111-8=
763 202-111-1238 smith@icdevgroup.net 20001006 12:12:13 20001006=
5 Credit Card (visa) __MVC_SQLUDATE__ shipped 1
-00013 00013 AhGiHXgR mmichaels upsg (UPS Ground) 1 14.99 5.35 0.94 21.28=
Michael Michaels Medical Supplies Co. 123 South Street Austin TX 30987 US=
512-111-9876 512-111-1237 michael@icdevgroup.net 20001006 12:12=
:55 20001006 5 Credit Card (visa) __MVC_SQLUDATE__ shipped consolidate=
d 1
-00014 00014 9bmBpw9j T00003 upsg (UPS Ground) 3 59.97 6.4 0 0 66.37 James=
Kelos 1414 Woodruff Ave. Idaho Falls ID 83401 US (208) 524- 7202 devnu=
ll@icdevgroup.net 20001006 12:20:25 20001006 5 Credit Card (visa)=
__MVC_SQLUDATE__ pending 0 0 0
-00015 00015 e69CSkSu ladams upsg (UPS Ground) 4 54.96 6.23 0 3.30 64.49 L=
ouis Adams Electronics Inc. 123 California Street Los Angeles CA 78902 US =
714-111-1234 714-111-1235 adams@icdevgroup.net 20001006 12:46:50=
20001006 5 Credit Card (visa) __MVC_SQLUDATE__ pending 0 0 0
+00001 00001 AhGiHXgR T00001 upsg (UPS Ground) 1 19.99 5.73 0 0 25.72 Uebe=
r Mensch 16 Hauptstrasse Portland OR 97201 US 503-555-1212 devnull@icde=
vgroup.net 20021006 17:36:36 20021006 0 Credit Card (visa) 1111=
1111* test_auth_code __MVC_SQLUDATE__ shipped 1Z0000 1 0 0=09=09
+00002 00002 AhGiHXgR ckirk upsg (UPS Ground) 27 641.73 15.06 0 41.71 698.=
5 Charles Kirk Auto Exchange Express 123 Exchange Dr. Seattle WA 34987 US =
360-111-1234 360-111-1244 kirk@icdevgroup.net 20021007 12:30:03 =
20021007 1 Credit Card (visa) __MVC_SQLUDATE__ backorder 0=09=09
+00003 00003 AhGiHXgR jking upsg (UPS Ground) 150 1948.5 61.01 0 116.91 21=
26.42 John King Car Parts, Inc. 123 Auto Blvd. Miami FL 39807 US 305-111-1=
234 305-111-1239 king@icdevgroup.net 20021007 19:14:28 20021007 =
1 Credit Card (visa) 11111111* test_auth_code __MVC_SQLUDATE__ shipped 1Z=
0000 1 0 0=09=09
+00004 00004 AhGiHXgR ladams upsg (UPS Ground) 27 257.89 11.13 0 15.47 284=
49 Louis Adams Electronics Inc. 123 California Street Los Angeles CA 7890=
2 US 714-111-1234 714-111-1235 adams@icdevgroup.net 20021007 20:=
47:12 20021007 1 Credit Card (visa) __MVC_SQLUDATE__ credit 0=09=
=09
+00005 00005 AhGiHXgR lriley upsg (UPS Ground) 17 164.83 6.9 6.59 178.32 =
Larry Riley Computerz Inc. 123 Monitor Rd. New York NY 46890 US 518-111-12=
34 518-111-1242 riley@icdevgroup.net 20021008 17:56:25 20021008 =
2 Credit Card (visa) 11111111 test_auth_code __MVC_SQLUDATE__ partial 1Z0=
000 hardhat=09=09=09=09=09=09=09
+00006 00006 AhGiHXgR T00002 upsr (UPS Next Day) 1 29.99 0 0 0 29.99 Bobby=
Bodega Computerz Inc. 9500 W. Covina Valdez AK 99686 US 907-111-1234 mi=
lton@icdevgroup.net 20021008 23:59:24 20021008 2 Credit Card (vis=
a) 11111111 test_auth_code __MVC_SQLUDATE__ pending 0 0 0=09=09
+00007 00007 AhGiHXgR mcarter upsg (UPS Ground) 2 89.98 9.84 0 4.50 104.32=
Michele Carter Spare Parts, Inc. 123 Parts Ctr Blvd. Annapolis MD 32498 U=
S 301-111-1234 703-111-1241 carter@icdevgroup.net 20021009 01:26=
:26 20021009 3 Credit Card (visa) 11111111* test_auth_code __MVC_SQLUDATE=
__ shipped 1Z0000 1 0 0=09=09
+00008 00008 AhGiHXgR mkeller upsg (UPS Ground) 3 53.97 5.17 0 0 59.14 Mic=
hael Keller InfoMed, Inc. 123 Oak St. Portland OR 45098 US 541-111-1234 54=
1-111-1240 keller@icdevgroup.net 20021009 11:29:30 20021009 3 Cr=
edit Card (visa) 11111111 test_auth_code __MVC_SQLUDATE__ pending 0 0=
0=09=09
+00009 00009 AhGiHXgR mmichaels upsg (UPS Ground) 100 100 0 0 6.3 106.3 Mi=
chael Michaels Medical Supplies Co. 123 South Street Austin TX 30987 US 51=
2-111-9876 512-111-1237 michael@icdevgroup.net 20021010 09:24:56=
20021010 4 Credit Card (visa) 11111111* test_auth_code __MVC_SQLUDATE__ =
shipped 1Z0000 0 0 0=09=09
+00010 00010 AhGiHXgR tlucas upsg (UPS Ground) 5 57.95 6.43 0 2.90 67.28 T=
homas Lucas Construct Buildings Inc. 123 Building Dr. Phoenix AZ 56987 US =
520-111-1234 520-111-1245 lucas@icdevgroup.net 20021010 10:05:15=
20021010 4 Credit Card (visa) 11111111- test_auth_code __MVC_SQLUDATE__ =
canceled 0=09=09
+00011 00011 AhGiHXgR jrollins upsg (UPS Ground) 1 44.99 6.87 0 1.57 53.43=
Joseph Rollins Expert Repair, Inc. 123 Area Rd. Richmond VA 22398 US 804-=
111-1234 804-111-1243 Rollins@icdevgroup.net 20021010 16:42:11 2=
0021010 4 Credit Card (visa) 11111111 test_auth_code __MVC_SQLUDATE__ pen=
ding 0 0 0=09=09
+00012 00012 AhGiHXgR ssmith upsg (UPS Ground) 1 18.99 5.61 24.6 Steve S=
mith Pharm Supplies, Inc. 456 Hopkins Ave Washington DC 20090 US 202-111-8=
763 202-111-1238 smith@icdevgroup.net 20021011 14:48:11 20021011=
5 Credit Card (visa) 11111111* test_auth_code __MVC_SQLUDATE__ shipped 1=
Z0000 1=09=09=09=09
+00013 00013 AhGiHXgR mmichaels upsg (UPS Ground) 1 14.99 5.35 0.94 21.28=
Michael Michaels Medical Supplies Co. 123 South Street Austin TX 30987 US=
512-111-9876 512-111-1237 michael@icdevgroup.net 20021011 15:18=
:05 20021011 5 Credit Card (visa) 11111111* test_auth_code __MVC_SQLUDATE=
__ shipped 1Z0000 consolidated 1=09=09=09=09
+00014 00014 9bmBpw9j T00003 upsg (UPS Ground) 3 59.97 6.4 0 0 66.37 James=
Kelos 1414 Woodruff Ave. Idaho Falls ID 83401 US (208) 524- 7202 devnu=
ll@icdevgroup.net 20021012 05:15:46 20021012 6 Credit Card (visa)=
11111111 test_auth_code __MVC_SQLUDATE__ pending 0 0 0=09=09
+00015 00015 e69CSkSu ladams upsg (UPS Ground) 4 54.96 6.23 0 3.30 64.49 L=
ouis Adams Electronics Inc. 123 California Street Los Angeles CA 78902 US =
714-111-1234 714-111-1235 adams@icdevgroup.net 20021013 04:50:05=
20021013 0 Credit Card (visa) 11111111 test_auth_code __MVC_SQLUDATE__ p=
ending 0 0 0=09=09
2.10 +127 -39 interchange/dist/lib/UI/pages/admin/order.html
rev 2.10, prev_rev 2.9
Index: order.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order.html,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- order.html 17 Oct 2002 04:46:23 -0000 2.9
+++ order.html 18 Oct 2002 06:00:10 -0000 2.10
@@ -23,6 +23,16 @@
$Scratch->{archive_nm} =3D 'archive';
$Scratch->{archive_label} =3D 'pending';
}
+ else {
+ $CGI->{showpending} =3D $Values->{showpending};
+ $CGI->{showarchive} =3D $Values->{showarchive};
+ }
+ if($CGI->{checked_status}) {
+ $Values->{checked_status} =3D $CGI->{checked_status};
+ }
+ else {
+ $Values->{checked_status} ||=3D '__UI_SHIPPED_STATUS__';
+ }
return;
[/calc]
[set icon_name]icon_orders.gif[/set]
@@ -162,6 +172,46 @@
</tr>
</table>
=20
+[if !scratch old_browser]
+<script>
+ var stat_array =3D new Array;
+ function push_el (el, status) {
+ if(stat_array[status] =3D=3D undefined) {
+ stat_array[status] =3D new Array;
+// alert('created ' + status + ' array');
+ }
+ var els =3D stat_array[status];
+ els[els.length] =3D el;
+ }
+
+ function checkType (type, cond) {
+ var other =3D false;
+ if(cond =3D=3D undefined)=20
+ cond =3D true;
+ if(cond !=3D true)=20
+ other =3D true;
+ if(stat_array =3D=3D undefined) {
+ return;
+ }
+ var i;
+ var alerted;
+ for(i in stat_array) {
+// alert("checking status of " + i);
+ var els =3D stat_array[i];
+ for (var j =3D 0; j < els.length; j++) {
+ var el =3D document.getElementById(els[j]);
+ if(el !=3D undefined) {
+ if(i =3D=3D type)=20
+ el.checked =3D cond;
+ else=20
+ el.checked =3D other;
+ }
+ }
+ }
+ }
+</script>
+[/if]
+
[if cgi ui_text_qualification]
[if !cgi mv_like_spec]
<H4>[msg arg.0=3D"[cgi ui_text_qualification]"]Entries containing "%s"[/ms=
g]</H4>
@@ -185,6 +235,11 @@
sf=3Ddeleted
se=3D1
op=3Dne
+ [if cgi only_status]
+ sf=3Dstatus
+ se=3D[cgi only_status]
+ op=3Deq
+ [/if]
[/else]
[/if]
[scratch start_at][set start_at][/set]
@@ -262,9 +317,16 @@
<TD>
<INPUT TYPE=3Dcheckbox NAME=3Dorder VALUE=3D"[item-code]"
[item-calc]
- return if $Scratch->{archive_nm} eq 'unarchive';
- return 'CHECKED' if q{[item-data transactions status]} eq '__UI_SHIPPED=
_STATUS__';
- return;
+ my $string =3D '';
+ if(! $Scratch->{old_browser}) {
+ my $nm =3D 'checker[item-increment]';
+ push @els, qq{push_el('$nm', '[item-param status]');};
+ $string .=3D "id=3D$nm ";
+ }
+ return $string if $Scratch->{archive_nm} eq 'unarchive';
+ $string .=3D 'CHECKED'
+ if q{[item-param status]} eq $Values->{checked_status};
+ return $string;
[/item-calc]
>
[page href=3D"@@MV_PAGE@@"
@@ -314,23 +376,31 @@
</tr>
[/more-list]
</table>
+[/search-region]
=20
-[if scratch can_delete]
-[button form=3Dbatch text=3D"[L]Delete checked orders[/L]"
- src=3D"__UI_IMG__delete.gif"
- link-text-too=3D1
- confirm=3D'[L]Are you sure you want to delete the checked orders?[/L]']de=
leteorder=3D1
-[/button]
-[/if]
- [button form=3Dbatch src=3D"[scratch archive_img]"
+<table>
+<tr>
+ <td>
+ [if scratch can_delete]
+ [button form=3Dbatch text=3D"[L]Delete checked orders[/L]"
+ src=3D"__UI_IMG__delete.gif"
+ link-text-too=3D1
+ confirm=3D'[L]Are you sure you want to delete the checked orders?[/L]']=
deleteorder=3D1
+ [/button]
+ [/if]
+
+ </td>
+ <td>
+ [button form=3Dbatch src=3D"[scratch archive_img]"
link-text-too=3D1
text=3D`
my $tmp =3D "$Scratch->{archive_nm} checked orders";
return errmsg("\u$tmp");
`]
[scratch archive_nm]order=3D1[/button]
-
- [button form=3Dbatch src=3D"__UI_IMG__icon_merch.gif"
+ </td>
+ <td>
+ [button form=3Dbatch src=3D"__UI_IMG__icon_merch.gif"
link-text-too=3D1
text=3D"Ship checked orders"
]
@@ -349,39 +419,32 @@
[/calc]
mv_nextpage=3D__UI_BASE__/order_status
[/button]
-
-
-
-
-
-<table>
- <tr>
- <td>
-
-<A HREF=3D"javascript:checkAll(document.batch, 'order', 0)"><img src=3D"__=
UI_IMG__box_checked.gif" border=3D0>Check all</A> &n=
bsp;
-<A HREF=3D"javascript:checkAll(document.batch, 'order', 1)"><img src=3D"__=
UI_IMG__box_empty.gif" border=3D0>Uncheck all</A>
-
- </td>
-
+ </td>
[if scratch old_browser]
- <td>
-<input type=3Dcheckbox name=3Dship_auto value=3D1> <span title=3D"Ship all=
lines of all orders, archive[if variable SETTLE_TRANSACTION], settle[/if]"=
>Ship all automatically</span>
+ <td colspan=3D2>
+ <input
+ type=3Dcheckbox
+ name=3Dship_auto
+ value=3D1>
+ <span title=3D"Ship all lines of all orders, archive[if variable SETTL=
E_TRANSACTION], settle[/if]">Ship all automatically</span>
</td>
[else]
<td>
-<script>
- function div_vis (show) {
- var el =3D document.getElementById('ship_auto_help');
- el.style.display =3D show ? 'block' : 'none';
- }
-</script>
+ <script>
+ [calc]
+ return join "\n", @els, '';
+ [/calc]
+ function div_vis (show) {
+ var el =3D document.getElementById('ship_auto_help');
+ el.style.display =3D show ? 'block' : 'none';
+ }
+ </script>
<span onMouseOver=3D"div_vis(1)" onMouseOut=3D"div_vis(0)">
<input type=3Dcheckbox name=3Dship_auto value=3D1> Ship all automatical=
ly
-
</span>
</td>
- <td height=3D50>
+ <td rowspan=3D2>
<div
id=3Dship_auto_help
style=3D"
@@ -393,16 +456,41 @@
archive[if variable SETTLE_TRANSACTION], settle[/if]
</div>
</td>
-
[/else]
[/if]
+ </tr>
+[if !scratch old_browser]
+ <tr>
+ <td>
+ <A HREF=3D"javascript:checkAll(document.batch, 'order', 0)"><img src=3D=
"__UI_IMG__box_checked.gif" border=3D0>Check all</A>  =
;
+ </td>
+ <td>
+ <A HREF=3D"javascript:checkAll(document.batch, 'order', 1)"><img src=3D=
"__UI_IMG__box_empty.gif" border=3D0>Uncheck all</A>
=20
+ </td>
+ <td>
+[page href=3D__UI_BASE__/spread
+ form=3D"
+ mv_data_table=3Dtransactions
+ ui_meta_view=3Dtracking
+ ui_text_qualification=3Dtracking_number=3D
+ "]<img src=3D"__UI_IMG__box_checked.gif" border=3D0>Enter tracking numb=
ers</A>=20=20
+
+ </td>
+ <tr>
+ [loop list=3D"shipped pending canceled partial"]
+ <td width=3D100>
+ <A HREF=3D"javascript:checkType('[loop-code]')">
+ <img src=3D"__UI_IMG__box_checked.gif" border=3D0>Check all [loop-co=
de]
+ </A>
+ </td>
+ [/loop]
</tr>
+[/if]
</table>
</FORM>
-[/search-region]
<!-- ----- END REAL STUFF ----- -->
=20
=20
@_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order.html,v 2.9 2002/10/17 04:46:23 =
mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order.html,v 2.10 2002/10/18 06:00:10=
mheins Exp $ -->
2.8 +8 -3 interchange/dist/lib/UI/pages/admin/order_status.html
rev 2.8, prev_rev 2.7
Index: order_status.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/order_status.html,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- order_status.html 18 Oct 2002 03:05:51 -0000 2.7
+++ order_status.html 18 Oct 2002 06:00:10 -0000 2.8
@@ -113,6 +113,7 @@
}
}
}
+ document.tform.tracking_number.focus();
</script>
=20
<select name=3Dship_all onChange=3D"copasetic(this, this.form)">
@@ -121,7 +122,9 @@
<option value=3D2> Cancel order
</select>
=20
- [button form=3Dtform bold=3D1 text=3D"[L]Update the order[/L]"]
+ [button form=3Dtform
+ extra=3D'style=3D"font-weight: bold"'
+ text=3D"[L]Update the order[/L]"]
mv_todo=3Dback
order=3D[cgi code]
[tag flag write]orderline transactions[/tag]
@@ -143,7 +146,7 @@
[if scratch tmp_orderid]
<input type=3Dcheckbox name=3Dsettle_transaction value=3D1
onChange=3D"copasetic(this, this.form)"
- [if scratch tmp_orderid !~ /\*$/] CHECKED [/if]>
+ [if scratch tmp_orderid !~ /[-*]$/] CHECKED [/if]>
<b>Settle transaction</b>
@@ -164,6 +167,8 @@
key=3D"[cgi order]"
form-name=3Dtform
table-width=3D"100%"
+ next-text=3D"Update status only, no ship function"
+ ok-button-style=3D"font-weight: normal; font-size: smaller"
no-table-meta=3D1
mv-nextpage=3D"[scratch mv_nextpage]"
ui_data_fields=3D"code status tracking_number order_id auth_code archived=
deleted"
@@ -191,4 +196,4 @@
</script>
=20
@_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.7 2002/10/18 03=
:05:51 mheins Exp $ -->
+<!-- page: @@MV_PAGE@@ version: $Id: order_status.html,v 2.8 2002/10/18 06=
:00:10 mheins Exp $ -->
2.9 +26 -13 interchange/dist/lib/UI/pages/admin/spread.html
rev 2.9, prev_rev 2.8
Index: spread.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/spread.html,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- spread.html 24 Sep 2002 01:37:29 -0000 2.8
+++ spread.html 18 Oct 2002 06:00:10 -0000 2.9
@@ -31,6 +31,7 @@
<FORM ACTION=3D"[area href=3D"[either][cgi ui_searchpage][or]@@MV_PAGE@@[/=
either]"]" METHOD=3DGET>
<INPUT TYPE=3Dhidden NAME=3Dmv_session_id VALUE=3D"[data session id]">
<INPUT TYPE=3Dhidden NAME=3Dmv_data_table VALUE=3D"[cgi mv_data_table]">
+<INPUT TYPE=3Dhidden NAME=3Dui_meta_view value=3D"[cgi ui_meta_view]">
<INPUT TYPE=3Dhidden NAME=3Dmv_action VALUE=3Dback>
<INPUT TYPE=3Dhidden NAME=3Dui_show_fields VALUE=3D"[cgi ui_show_fields]">
=20
@@ -58,12 +59,11 @@
[/if]
</FORM>
=20
-
-
[perl tables=3D"[cgi mv_data_table] __UI_META_TABLE__"]
my $table =3D $CGI->{mv_data_table};
my $db =3D $Db{$table};
my $mrec =3D $Tag->meta_record($table, $CGI->{ui_meta_view}) || {};
+ my $sp =3D q{@@MV_PAGE@@};
$mrec ||=3D {};
$mrec->{spread_fields} ||=3D join(" ", $db->columns());
$mrec->{spread_height} ||=3D 10;
@@ -71,8 +71,27 @@
$mrec->{spread_sort} ||=3D $key;
$CGI->{ui_description_field} =3D $mrec->{label};
=20
+ my $qualbase =3D qq{
+ sp=3D$sp
+ st=3Ddb
+ ml=3D$mrec->{spread_height}
+ ms=3D0
+ };
+ my $qualsimple =3D qq{
+ fi=3D$table
+ rf=3D$CGI->{ui_data_key_name}
+ tf=3D$mrec->{spread_sort}
+ };
my $qual;
- if ($CGI->{ui_text_qualification} and $CGI->{ui_text_qualification} =3D~ =
/=3D/ ) {
+ my $sstring;
+ if(! $CGI->{ui_text_qualification}) {
+ $qual =3D "ra=3Dyes";
+ }
+ elsif ($CGI->{ui_text_qualification} =3D~ /^\s*select/ ) {
+ $qual =3D "sq=3D$CGI->{ui_text_qualification}";
+ $sstring =3D join "\n", $qualbase, $qual;
+ }
+ elsif ($CGI->{ui_text_qualification} =3D~ /=3D/ ) {
my ($f, $s) =3D split /\s*=3D\s*/, $CGI->{ui_text_qualification} , 2;
$qual =3D "co=3D1\nop=3Deq\nse=3D$s\nsf=3D$f";
}
@@ -83,6 +102,8 @@
$qual =3D "ra=3Dyes";
}
=20
+ $sstring ||=3D join "\n", $qualbase, $qualsimple, $qual;
+
my @fields =3D split /[\0\s,]+/, $mrec->{spread_fields};
@fields =3D grep length($_) && $_ ne $key, @fields;
=20
@@ -92,17 +113,8 @@
=20
$CGI->{mrec_spread_width} ||=3D $mrec->{spread_width} || 12;=20
=20
- my $sp =3D q{@@MV_PAGE@@};
+ $Scratch->{mrec_options} =3D $sstring;
=20
- $Scratch->{mrec_options} =3D qq{
- $qual
- fi=3D$table
- st=3Ddb
- sp=3D$sp
- ml=3D$mrec->{spread_height}
- rf=3D$CGI->{ui_data_key_name}
- tf=3D$mrec->{spread_sort}
- };
$Scratch->{ui_num_col} =3D scalar(@fields) + 2;
$Scratch->{ui_most_col} =3D $Scratch->{ui_num_col} - 1;=20
$Config->{NoSearch} =3D '';
@@ -119,6 +131,7 @@
<INPUT TYPE=3Dhidden NAME=3D"mv_click" VALUE=3D"process_filter">
<INPUT TYPE=3Dhidden NAME=3D"mv_update_empty" VALUE=3D"1">
<INPUT TYPE=3Dhidden NAME=3D"mv_update_empty_key" VALUE=3D"0">
+<INPUT TYPE=3Dhidden NAME=3D"ui_meta_view" value=3D"[cgi ui_meta_view]">
<INPUT TYPE=3Dhidden NAME=3D"ui_text_qualification" value=3D"[cgi ui_text_=
qualification]">
<INPUT TYPE=3Dhidden NAME=3D"ui_return_to" value=3D"[cgi ui_return_to]">
<INPUT TYPE=3Dhidden NAME=3D"mv_data_fields" VALUE=3D"[cgi mv_data_fields]=
">