/[drupal]/contributions/modules/openresort/accommodation/accommodation.module
ViewVC logotype

Diff of /contributions/modules/openresort/accommodation/accommodation.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.19, Wed Jan 2 22:14:25 2008 UTC revision 1.20, Sat Jan 26 20:42:48 2008 UTC
# Line 385  function accommodation_confirmation_emai Line 385  function accommodation_confirmation_emai
385    
386  function _accommodation_process_instant(){  function _accommodation_process_instant(){
387          $time = time();          $time = time();
388          $result = db_query('SELECT txnid FROM {ec_transaction} WHERE payment_status =7 AND workflow =1 AND created < %d',$time - 3600);          $result = db_query('SELECT txnid FROM {ec_transaction} WHERE (payment_status =7 OR payment_status =2) AND workflow =1 AND created < %d',$time - 3600);
389          while($txnid = db_fetch_object($result)){          while($txnid = db_fetch_object($result)){
390                  $t = store_transaction_load($txnid->txnid);                  $t = store_transaction_load($txnid->txnid);
391                  $t->workflow = 3;                  $t->workflow = 3;
# Line 1007  function theme_accommodation_availabilit Line 1007  function theme_accommodation_availabilit
1007                              $rows[] = array('data'=>array(                              $rows[] = array('data'=>array(
1008                                  array('data' =>l($item->title, "node/" . $item->nid),'width'=>'170px','class'=>'unitlink'),                                  array('data' =>l($item->title, "node/" . $item->nid),'width'=>'170px','class'=>'unitlink'),
1009                                  t('Sleeps') . " " . $item->occupancy,                                  t('Sleeps') . " " . $item->occupancy,
1010                                  payment_format($item->price),                                  payment_format($item->price).' '.$confirmation,
1011                                  l(t('Book now'),'booknow/accommodation/' . $item->bid . '/' . $edit['arrive_db'] . '/' . $edit['depart_db'] . '/' . $item->iid . '/'. $edit['num_people'],array('class'=>'booknow')),                                  l($linktext,'booknow/accommodation/' . $item->bid . '/' . $edit['arrive_db'] . '/' . $edit['depart_db'] . '/' . $item->iid . '/'. $edit['num_people'],array('class'=>'booknow')),
1012                                  ),                                  ),
1013                                  );                                  );
1014                          }                          }
# Line 1039  function accommodation_ec_transactionapi Line 1039  function accommodation_ec_transactionapi
1039          case 'insert':          case 'insert':
1040           $localitems = $txn->items;           $localitems = $txn->items;
1041                   $holdtime = variable_get('accommodation_cart_accom_hold',86400);                   $holdtime = variable_get('accommodation_cart_accom_hold',86400);
1042                   if($txn->payment_status == '7'){                   if($txn->payment_status == '7' || $txn->payment_status == '2'){
1043                   foreach($localitems as $localitem){                   foreach($localitems as $localitem){
1044                           $localsubitem = $localitem->subitem;                           $localsubitem = $localitem->subitem;
1045                           while($key = key($localsubitem)){                           while($key = key($localsubitem)){
# Line 1060  function accommodation_ec_transactionapi Line 1060  function accommodation_ec_transactionapi
1060           $transaction = unserialize($transaction->data);           $transaction = unserialize($transaction->data);
1061           //there are cases where update is called rather than insert           //there are cases where update is called rather than insert
1062                  if(!$txn->workflow){                  if(!$txn->workflow){
1063                          if($txn->payment_status == '7'){                          if($txn->payment_status == '7' || $txn->payment_status == '2'){
1064                                  $localsubitem = $transaction->subitem;                                  $localsubitem = $transaction->subitem;
1065                                          $holdtime = variable_get('accommodation_cart_accom_hold',86400);                                          $holdtime = variable_get('accommodation_cart_accom_hold',86400);
1066                                  while($key = key($localsubitem)){                                  while($key = key($localsubitem)){
# Line 1079  function accommodation_ec_transactionapi Line 1079  function accommodation_ec_transactionapi
1079                          $row = db_fetch_object(db_query("SELECT iid,date,status, reserved_date FROM {accommodation_availability} WHERE aid = %d",$key));                          $row = db_fetch_object(db_query("SELECT iid,date,status, reserved_date FROM {accommodation_availability} WHERE aid = %d",$key));
1080                          switch ($txn->workflow){                          switch ($txn->workflow){
1081                                  case '1':                                  case '1':
1082                                          if($txn->payment_status == '7' && (($row->reserved_date - ($txn->created + variable_get('accommodation_hold_cust_time',900))) <= 0)){                                          if(($txn->payment_status == '7' ||$txn->payment_status == '2') && (($row->reserved_date - ($txn->created + variable_get('accommodation_hold_cust_time',900))) <= 0)){
1083                                                  $holdtime = variable_get('accommodation_cart_accom_hold',86400);                                                  $holdtime = variable_get('accommodation_cart_accom_hold',86400);
1084                                                  if(module_exists('virtual_unit')){                                                  if(module_exists('virtual_unit')){
1085                                                          virtual_unit_update_availability($row,$holdtime);                                                          virtual_unit_update_availability($row,$holdtime);
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20
  ViewVC Help
Powered by ViewVC 1.1.2