From 9c28a546f605b239adb2bb98f4a835a7b6746e7c Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 16 Feb 2017 16:51:20 -0500 Subject: [PATCH] Lot's of updates for packages Text updates for removing Arnold Line ferry. Text updates for the new 2017 year. Removing Youth from the admin side of things. Update the add package in admin to have correct dates. Updating the dates to start and end the 2017 year for packages. --- .gitignore | 2 + admin/packages/addPackage.php | 6 +- admin/packages/js/order-form.js | 16 +-- admin/packages/orderForm.php | 20 ++-- 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_order_form.inc | 22 ++-- classes/class_package.inc | 108 +++++++++--------- ferry-lines.php | 14 --- ferry-lines2.php | 8 -- order-form.php | 2 +- promote.php | 2 +- purchase.php | 8 +- purchase.php.save | 2 +- sample-itinerary.php | 7 +- setup.phtml | 3 +- 21 files changed, 114 insertions(+), 144 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bd9e9a0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +authorize/sequence.txt +admin/packages/build diff --git a/admin/packages/addPackage.php b/admin/packages/addPackage.php index d86bd07..d9d5005 100644 --- a/admin/packages/addPackage.php +++ b/admin/packages/addPackage.php @@ -42,7 +42,7 @@ if( date("w",$min_time) == 0 ) $min_time = mktime(0,0,0,date('m'),date('j')+6,date('Y')); } // min date for packages is May 15th (fort closed before this) -$fort_opens = mktime(0,0,0,5,15,date('Y')); +$fort_opens = mktime(0,0,0,5,13,date('Y')); if( $min_time < $fort_opens ) { $min_time = $fort_opens; @@ -58,7 +58,7 @@ else // min date for packages is May 13th (fort closed before this) $min_date = date("n/j/Y",$min_time); // max date for packages is Oct 2nd (fort closed after this) -$max_time = mktime(0,0,0,10,3,date('Y')); +$max_time = mktime(0,0,0,9,30,date('Y')); $max_date = date("n/j/Y",$max_time); $cal_set = ',pagedate: "'.$page_date.'",mindate: "'.$min_date.'",maxdate: "'.$max_date.'"'; $fields[] = array('name'=>'cday','type'=>'hide'); @@ -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/orderForm.php b/admin/packages/orderForm.php index f8ee791..8632442 100644 --- a/admin/packages/orderForm.php +++ b/admin/packages/orderForm.php @@ -307,19 +307,19 @@ class orderForm extends form_creator $this->DB->db_exec($query) ; } else { // if they don't exists then setup INSERT - $query = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values');"; + $query = "INSERT INTO contact ($contact_fields) VALUES ('$contact_values') RETURNING id;"; $res2 = $this->DB->db_exec($query) ; - $lastoid = pg_getlastoid($res2) ; - $query = "SELECT id FROM contact WHERE oid = $lastoid"; - $res3 = $this->DB->db_exec($query) ; - $contact_id = pg_result($res3, 0, 'id') ; + //$lastoid = pg_getlastoid($res2) ; + //$query = "SELECT id FROM contact WHERE oid = $lastoid"; + //$res3 = $this->DB->db_exec($query) ; + $contact_id = pg_result($res2, 0, 'id') ; } - $query = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values')"; + $query = "INSERT INTO package_req (contact_id,$fields) VALUES ($contact_id,'$values') RETURNING package_number;"; $res = $this->DB->db_exec($query) ; - $lastoid = pg_getlastoid($res) ; - $query2 = "SELECT package_number FROM package_req WHERE oid = $lastoid"; - $res2 = $this->DB->db_exec($query2) ; - $package_id = pg_result($res2, 0, 'package_number'); + //$lastoid = pg_getlastoid($res) ; + //$query2 = "SELECT package_number FROM package_req WHERE oid = $lastoid"; + //$res2 = $this->DB->db_exec($query2) ; + $package_id = pg_result($res, 0, 'package_number'); $this->send_cust_email($package_id) ; header('Location: index.php');exit; } 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 bc053f0..1293523 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.

@@ -55,10 +55,12 @@ type="text/javascript">
form; - //echo $order_form->form_scripts; + echo $order_form->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

    -
  • Board your choice of ferry service to Mackinac Island. Arnold Line, Shepler's or Star Line. Mackinac Island ferries feature regularly scheduled daily departures from either St. Ignace or Mackinaw City. (15-20 minutes)
    • +
  • Board your choice of ferry service to Mackinac Island. Shepler's or Star Line. Mackinac Island ferries feature regularly scheduled daily departures from either St. Ignace or Mackinaw City. (16-40 minutes)
  • Arrive on Mackinac. Board Mackinac Island Carriage Tours for a horse-drawn carriage tour downtown Mackinac Island (30 minutes)
    • -
  • Arrive at Surrey Hills. Tour Mackinac Island Butterfly Conservatory (30 - 45 minutes)
    • +
  • Arrive at Surrey Hills. Tour Wings of Mackinac Butterfly Conservatory (30 - 45 minutes)
@@ -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.
diff --git a/setup.phtml b/setup.phtml index 80d709b..56ce2ff 100755 --- a/setup.phtml +++ b/setup.phtml @@ -119,8 +119,9 @@ if( !isset($SITEINFO) ) define("BASE_SECURE_URL", $BASE_SECURE_URL."/"); // url used for the secur site $BASE_URL = "http://".$base_url; // This needs to be set to the real url ie. http://www.upnorth.net } + define("AUTH_TEST_MODE","TRUE"); define("BASE_INSECURE_URL", $BASE_URL."/"); - define("CONN_STR", "dbname=mackinacislandpackages"); // DB connection string + define("CONN_STR", "user=nobody dbname=mackinacislandpackages"); // DB connection string define("OWNER_EMAIL", "mackinacpackage@mict.com"); // site owner's email address define("FROM_NEWS_EMAIL", "mackinacpackage@mict.com"); // site owner's email address define("REPLY_TO", "mackinacpackage@mict.com"); // the reply-to field for email's -- 2.17.1