[interchange-cvs] interchange - heins modified 4 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Thu Nov 10 11:55:02 EST 2005
User: heins
Date: 2005-11-10 16:55:02 GMT
Modified: dist/lib/UI/pages/admin entry.html
Modified: dist/standard/products variable.txt mv_metadata.asc
Modified: dist/standard/etc profiles.order
Log:
* Add ability to have different payment modes in Admin order entry
than are in the online store.
Revision Changes Path
2.17 +6 -1 interchange/dist/lib/UI/pages/admin/entry.html
rev 2.17, prev_rev 2.16
Index: entry.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/entry.html,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- entry.html 23 Apr 2005 18:10:07 -0000 2.16
+++ entry.html 10 Nov 2005 16:55:02 -0000 2.17
@@ -663,18 +663,23 @@
[/else]
[/if]">
[if variable CREDIT_CARDS_ACCEPTED]
+ [or variable ENTRY_CREDIT_CARDS_ACCEPTED]
<option [selected mv_order_profile credit_card] value="credit_card">[L]Credit Card[/L]
[/if]
[if variable CHECK_ACCEPTED]
+ [or variable ENTRY_CHECK_ACCEPTED]
<option [selected mv_order_profile online_check] value="online_check">[L]Online Check[/L]
[/if]
[if variable PO_ACCEPTED]
+ [or variable ENTRY_PO_ACCEPTED]
<option [selected mv_order_profile purchase_order] value="purchase_order">[L]Company P.O.[/L]
[/if]
[if variable POSTAL_ACCEPTED]
+ [or variable ENTRY_POSTAL_ACCEPTED]
<option [selected mv_order_profile postal] value="postal">[L]Postal Billing[/L]
[/if]
[if variable COD_ACCEPTED]
+ [or variable ENTRY_COD_ACCEPTED]
<option [selected mv_order_profile cod] value="cod">[L]C.O.D.[/L]
[/if]
</SELECT>
@@ -1045,7 +1050,7 @@
</td>
<td align=left colspan=3 class="contentbar1">
<b>
- <INPUT NAME=project_id VALUE="[value project_id]" SIZE=14>
+ <INPUT NAME="po_number" VALUE="[value po_number]" SIZE=14>
</b>
</td>
</tr>
1.5 +5 -0 interchange/dist/standard/products/variable.txt
rev 1.5, prev_rev 1.4
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/variable.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- variable.txt 4 Nov 2005 05:27:03 -0000 1.4
+++ variable.txt 10 Nov 2005 16:55:02 -0000 1.5
@@ -10,11 +10,14 @@
CHECKOUT_PAGE ord/multi Cart/Checkout
CHECKOUT_PAYMENT_HEIGHT 120 Cart/Checkout
CHECK_ACCEPTED 1 Payment
+ENTRY_CHECK_ACCEPTED 1 Payment
CITY Anywhere, OH 45056 Company
COD_ACCEPTED 0 Payment
+ENTRY_COD_ACCEPTED 0 Payment
COMPANY __MVC_COMPANY__ Company
CONTRAST RED Template
CREDIT_CARDS_ACCEPTED visa mc amex discover Payment
+ENTRY_CREDIT_CARDS_ACCEPTED visa mc amex discover Payment
DECREMENT_INVENTORY 1 Order
DEFAULT_LOCALE en_US Internationalization
DOCROOT __MVC_DOCUMENTROOT__ Directories and Paths
@@ -52,7 +55,9 @@
PGSQL __MVC_PGSQL__ Database
PHONE (765) 555-1212 Company
POSTAL_ACCEPTED 0 Payment
+ENTRY_POSTAL_ACCEPTED 0 Payment
PO_ACCEPTED 1 Payment
+ENTRY_PO_ACCEPTED 1 Payment
PUBLISH_DO_RCS 0 Admin Control
PUBLISH_NO_PAGE_ROOT 0 Admin Control
PUBLISH_PUT_IMAGES images Admin Control
1.7 +4 -0 interchange/dist/standard/products/mv_metadata.asc
rev 1.7, prev_rev 1.6
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/mv_metadata.asc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mv_metadata.asc 4 Nov 2005 05:27:03 -0000 1.6
+++ mv_metadata.asc 10 Nov 2005 16:55:02 -0000 1.7
@@ -344,6 +344,8 @@
variable::Variable::CGI_URL text CGI URL URL that calls Interchange, without the server name
variable::Variable::CHECK_ACCEPTED select 0=No, 1=Yes
variable::Variable::COD_ACCEPTED select 0=No, 1=Yes
+variable::Variable::ENTRY_CHECK_ACCEPTED select 0=No, 1=Yes
+variable::Variable::ENTRY_COD_ACCEPTED select 0=No, 1=Yes
variable::Variable::CREDIT_CARDS_ACCEPTED checkbox visa=Visa, mc=Mastercard, discover=Discover, amex=American Express,dinersclub=Diners Club,carteblanche=Carte Blanche,enroute=En Route,bankcard=Bank Card (AU), jcb=JCB,other=Any passing LUHN-10 null_to_space
variable::Variable::CUSTOMER_VIEW_DEALER yesno Show dealer info Set to Yes to show dealer status on customer view page
variable::Variable::CUSTOMER_VIEW_LARGE yesno Query by example view Select if you have a very large customer database, to prevent building huge lists of customers every time you access the customer tab.
@@ -362,7 +364,9 @@
variable::Variable::ORDER_VIEW_LARGE yesno Query by example view Select when you have large numbers of pending orders to display, to prevent long startup times when clicking the Orders tab.
variable::Variable::PGP_KEY gpg_keys Key selector [page admin/gpg_key]Add a GPG/PGP key</A>
variable::Variable::POSTAL_ACCEPTED select =No,
1=Yes Accept postal orders?
+variable::Variable::ENTRY_POSTAL_ACCEPTED select =No,
1=Yes Accept postal orders at admin?
variable::Variable::PO_ACCEPTED select 0=No, 1=Yes
+variable::Variable::ENTRY_PO_ACCEPTED select 0=No, 1=Yes
variable::Variable::SECURE_ENABLE yesno Enable Secure URL?
variable::Variable::SETTLE_TRANSACTION yesno Settle transactions If you ship hard goods and only do an authorization at order time, you may choose to settle the transaction automatically via the Order manager. This needs to be set to Yes to enable this.
variable::Variable::STATIC_LOGGED select No, Yes Enabled for logged in users? <b>Yes</b> will cause Interchange to generate static links where possible, even when users are logged in.
1.5 +8 -0 interchange/dist/standard/etc/profiles.order
rev 1.5, prev_rev 1.4
Index: profiles.order
===================================================================
RCS file: /var/cvs/interchange/dist/standard/etc/profiles.order,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- profiles.order 29 Jan 2005 00:43:52 -0000 1.4
+++ profiles.order 10 Nov 2005 16:55:02 -0000 1.5
@@ -92,7 +92,9 @@
&fatal = yes
&setcheck = end_profile 1
+[if !session admin]
&set = prof_po_accepted [var PO_ACCEPTED]
+[/if]
prof_po_accepted=required This site doesn't accept purchase orders. You should not have been offered that option; please contact us.
@@ -130,7 +132,9 @@
__COMMON_ORDER_PROFILE__
+[if !session admin]
&set = prof_mode_accepted [var POSTAL_ACCEPTED]
+[/if]
prof_mode_accepted=required This site doesn't accept postal orders. You should not have been offered that option; please contact us.
@@ -157,7 +161,9 @@
not_po_box=mandatory No PO boxes allowed for COD.
[/if]
+[if !session admin]
&set = prof_mode_accepted [var COD_ACCEPTED]
+[/if]
prof_mode_accepted=required This site doesn't accept COD orders. You should not have been offered that option; please contact us.
@@ -178,7 +184,9 @@
__COMMON_ORDER_PROFILE__
+[if !session admin]
&set = prof_mode_accepted [var CHECK_ACCEPTED]
+[/if]
prof_mode_accepted=required This site doesn't accept online checks. You should not have been offered that option; please contact us.
[value name=check_routing filter=digits hide=1]
More information about the interchange-cvs
mailing list