From b3b99cd9164db018199ebac4d6bba00510bbbdbf Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 18 May 2017 10:42:15 -0400 Subject: [PATCH] updates from live site --- admin/packages/addPackage.php | 2 +- admin/packages/js/order-form.js | 16 +-- admin/packages/package.ini | 10 +- .../summary-report-member-sub-totals.html | 2 - .../summary-report-member-totals.html | 2 - admin/packages/templates/summary-report.html | 6 - admin/packages/ticket_member.ini | 10 +- classes/class_form_creator.inc | 6 +- classes/class_members.inc | 2 +- classes/class_package.inc | 108 +++++++++--------- faq.php | 53 +++++---- ferry-lines.php | 14 --- ferry-lines2.php | 8 -- order-form.php | 4 +- promote.php | 2 +- purchase.php | 8 +- purchase.php.save | 2 +- sample-itinerary.php | 7 +- 18 files changed, 117 insertions(+), 145 deletions(-) diff --git a/admin/packages/addPackage.php b/admin/packages/addPackage.php index e1beec6..d61434e 100644 --- a/admin/packages/addPackage.php +++ b/admin/packages/addPackage.php @@ -78,7 +78,7 @@ $data['mail_ok'] = 't'; // $fields[] = array('title'=>'Ticket Amounts','type'=>'static_text'); $fields[] = array('name'=>'adult','title'=>'Adults (18+) $'.number_format( $adult_price, 2 ).'','type'=>'drop','info'=>$people_sel,'req'=>0); -$fields[] = array('name'=>'youth','title'=>'Youth (13-17) $'.number_format( $youth_price, 2) .'','type'=>'drop','info'=>$people_sel,'req'=>0); +//$fields[] = array('name'=>'youth','title'=>'Youth (13-17) $'.number_format( $youth_price, 2) .'','type'=>'drop','info'=>$people_sel,'req'=>0); $fields[] = array('name'=>'child','title'=>'Children (5-12) $'.number_format( $child_price, 2 ).'','type'=>'drop','info'=>$people_sel,'req'=>0); $ship_type1 = '
Ship Package to me:
diff --git a/admin/packages/js/order-form.js b/admin/packages/js/order-form.js index 0c30aac..0c943bf 100644 --- a/admin/packages/js/order-form.js +++ b/admin/packages/js/order-form.js @@ -41,8 +41,8 @@ function validateFields() var ticketTotal = 0; var adultSel = document.getElementById('adult'); ticketTotal += adultSel.value; - var youthSel = document.getElementById('youth'); - ticketTotal += youthSel.value; + //var youthSel = document.getElementById('youth'); + //ticketTotal += youthSel.value; var childSel = document.getElementById('child'); ticketTotal += childSel.value; if( ticketTotal == 0 ) @@ -208,17 +208,17 @@ function calc_price() // var child_price = 30.00; var adult = document.getElementById('adult').value * 1; var adult_total = adult * adult_price; - var youth = document.getElementById('youth').value * 1; - var youth_total = youth * youth_price; + //var youth = document.getElementById('youth').value * 1; + //var youth_total = youth * youth_price; var child = document.getElementById('child').value * 1; var child_total = child * child_price; - var grand_total = adult + youth + child; - var grand_total_price = adult_total + youth_total + child_total; + var grand_total = adult + child; + var grand_total_price = adult_total + child_total; var overnight = document.getElementById('overnight').value; grand_total_price += parseFloat( '9.00' ); grand_total_price += parseFloat( overnight ); var msg = 'adult: ' + adult + ' : ' + adult_total + '\n'; - msg += 'adult: ' + youth + ' : ' + youth_total + '\n'; + //msg += 'adult: ' + youth + ' : ' + youth_total + '\n'; msg += 'adult: ' + child + ' : ' + child_total + '\n'; msg += 'Total: ' + grand_total + ' : ' + grand_total_price; var total_out = document.getElementById('total-amount'); @@ -251,7 +251,7 @@ function init() { // shipping type radio var adult = document.getElementById('adult').onchange = function(){calc_price()}; - var youth = document.getElementById('youth').onchange = function(){calc_price()}; + //var youth = document.getElementById('youth').onchange = function(){calc_price()}; var child = document.getElementById('child').onchange = function(){calc_price()}; var ship_out1 = document.getElementById('shipping1id1').onchange = function(){add_over_night()}; diff --git a/admin/packages/package.ini b/admin/packages/package.ini index f2ba843..484fde3 100755 --- a/admin/packages/package.ini +++ b/admin/packages/package.ini @@ -83,11 +83,11 @@ title = Adult type = text view = v -[youth] -name = youth -title = Youth -type = text -view = v +;[youth] +;name = youth +;title = Youth +;type = text +;view = v [child] name = child diff --git a/admin/packages/templates/summary-report-member-sub-totals.html b/admin/packages/templates/summary-report-member-sub-totals.html index 8842d13..5c39156 100755 --- a/admin/packages/templates/summary-report-member-sub-totals.html +++ b/admin/packages/templates/summary-report-member-sub-totals.html @@ -2,8 +2,6 @@ - - diff --git a/admin/packages/templates/summary-report-member-totals.html b/admin/packages/templates/summary-report-member-totals.html index 98da9ae..f6a90bf 100755 --- a/admin/packages/templates/summary-report-member-totals.html +++ b/admin/packages/templates/summary-report-member-totals.html @@ -2,8 +2,6 @@ - - diff --git a/admin/packages/templates/summary-report.html b/admin/packages/templates/summary-report.html index 5db69e6..8dc867b 100755 --- a/admin/packages/templates/summary-report.html +++ b/admin/packages/templates/summary-report.html @@ -10,10 +10,6 @@ # of Adult - - # of Youth - - # of Child @@ -25,8 +21,6 @@ Member Name Adults Adults Price - Youths - Youths Price Children Children Price Total Price diff --git a/admin/packages/ticket_member.ini b/admin/packages/ticket_member.ini index f5cddd6..272706e 100755 --- a/admin/packages/ticket_member.ini +++ b/admin/packages/ticket_member.ini @@ -24,11 +24,11 @@ title = "Amount (adult)" type = numeric req = 1 -[youth] -name = youth -title = "Amount (youth)" -type = numeric -req = 1 +;[youth] +;name = youth +;title = "Amount (youth)" +;type = numeric +;req = 1 [child] name = child diff --git a/classes/class_form_creator.inc b/classes/class_form_creator.inc index b2ee923..a882f5e 100755 --- a/classes/class_form_creator.inc +++ b/classes/class_form_creator.inc @@ -499,8 +499,10 @@ class form_creator extends GLM_TOOLBOX { $this->form_scripts .= '
-

The Mackinac Island Experience Package is brought to you by the Mackinac Island Carriage Tour Company, serving visitors to Mackinac Island for over 100 years. In cooperation with Grand Hotel, Mackinac State Historic Parks, Wings of Mackinac Butterfly Conservatory, Arnold Transit Company, Shepler's Mackinac Island Ferry and Star Line Mackinac Island Hydro-Jet Ferry.

+

The Mackinac Island Experience Package is brought to you by the Mackinac Island Carriage Tour Company, serving visitors to Mackinac Island for over 100 years. In cooperation with Grand Hotel, Mackinac State Historic Parks, Wings of Mackinac Butterfly Conservatory, Shepler's Mackinac Island Ferry and Star Line Mackinac Island Hydro-Jet Ferry.

Your package voucher will either be mailed or available for pick up at will-call depending on your order and arrival dates. Only one voucher is issued per package purchase which is exchanged for tickets at each attraction.

This is an all inclusive package. No partial refunds will be given. Your package voucher tickets will either be mailed or available for pick up at will-call depending on your order and arrival dates.

@@ -57,9 +57,11 @@ type="text/javascript"> form; echo $order_form->form_scripts; -?> +
diff --git a/purchase.php.save b/purchase.php.save index e67c6a1..71634db 100755 --- a/purchase.php.save +++ b/purchase.php.save @@ -47,7 +47,7 @@ type="text/javascript">
-

The Mackinac Island Experience Package is brought to you by the Mackinac Island Carriage Tour Company, serving visitors to Mackinac Island for over 100 years. In cooperation with Grand Hotel, Mackinac State Historic Parks, Wings of Mackinac Butterfly Conservatory, Arnold Transit Company, Shepler's Mackinac Island Ferry and Star Line Mackinac Island Hydro-Jet Ferry.

+

The Mackinac Island Experience Package is brought to you by the Mackinac Island Carriage Tour Company, serving visitors to Mackinac Island for over 100 years. In cooperation with Grand Hotel, Mackinac State Historic Parks, Wings of Mackinac Butterfly Conservatory, Shepler's Mackinac Island Ferry and Star Line Mackinac Island Hydro-Jet Ferry.

Your package voucher will either be mailed or available for pick up at will-call depending on your order and arrival dates. Only one voucher is issued per package purchase which is exchanged for tickets at each attraction.

This is an all inclusive package. No partial refunds will be given. Your package voucher tickets will either be mailed or available for pick up at will-call depending on your order and arrival dates.

diff --git a/sample-itinerary.php b/sample-itinerary.php index d5c8d8c..54b1a86 100755 --- a/sample-itinerary.php +++ b/sample-itinerary.php @@ -20,9 +20,9 @@

Early to Mid-Morning

@@ -51,7 +51,8 @@ to receive your admission pass. You may also use this on the same day as your admission for a $10.00 discount per adult on the Grand Luncheon Buffet, served daily from 12:00 p.m. to 2:00 p.m. in the hotel's Main Dining Room. Casual resort wear is appropriate during the -day at Grand Hotel. No tank tops or cut offs are permitted. +day at Grand Hotel. No tank tops or cut offs are permitted. Please check with Grand Hotel +regarding black out dates for Grand Luncheon Buffet 906-847-3331.
-- 2.17.1