diff --git a/fulcrm_shoppingcart.module b/fulcrm_shoppingcart.module index cdc2b20..05afdd5 100644 --- a/fulcrm_shoppingcart.module +++ b/fulcrm_shoppingcart.module @@ -132,6 +132,9 @@ function fulcrm_shoppingcart_theme( $existing, $type, $theme, $path ) { 'fulcrm_shoppingcart_transaction_complete' => array( 'variables' => array( 'transaction' => null ), // data returned from fulcrm API 'template' => 'fulcrm_shoppingcart_transaction_complete', ), + 'fulcrm_shoppingcart_transaction_incomplete' => array( 'variables' => array( 'transaction' => null ), // data returned from fulcrm API + 'template' => 'fulcrm_shoppingcart_transaction_incomplete', + ), 'fulcrm_shoppingcart_transaction_mailshots' => array( 'variables' => array( 'transaction' => null ), // data returned from fulcrm API 'template' => 'fulcrm_shoppingcart_transaction_mailshots', ), @@ -377,6 +380,10 @@ function fulcrm_shoppingcart_buy_eventbookingtype_form( $form, &$form_state, $pe '#markup' => '

' . check_plain( $product[ 'name' ] ) . '

', ); + drupal_set_title( check_plain( $eventbookingtype[ 'event' ][ 'name' ] ) . ', ' . + check_plain( $eventbookingtype[ 'name' ] ) . ', ' . + check_plain( $product_data[ 'data' ][ 'name' ] ) ); + // $form[ 'person' ] = fulcrm_collection_to_form( 'person', $eventbookingtype[ 'person_ddatacollection' ], $person[ 'd' ] ); if ( array_key_exists( 'name', $person ) ) @@ -472,6 +479,8 @@ function fulcrm_shoppingcart_buy_generic_product_form( $form, &$form_state, $per '#markup' => '

' . check_plain( $product[ 'name' ] ) . '

', ); + drupal_set_title( check_plain( $product_data[ 'data' ][ 'name' ] ) ); + $form[ 'actions' ] = array( '#type' => 'actions' ); $form[ 'actions' ][ 'save' ] = array( '#type' => 'submit', '#value' => t('Add to Cart'), @@ -769,7 +778,7 @@ function fulcrm_shoppingcart_checkout_failure( $transaction_id, $hmac ) { } foreach ( $hook_results as $hook_result ) return $hook_result; - return 'failure'; + return theme( 'fulcrm_shoppingcart_transaction_complete', array( 'transaction' => $transaction_data[ 'data' ] ) ); } } diff --git a/fulcrm_shoppingcart_transaction_complete.tpl.php b/fulcrm_shoppingcart_transaction_complete.tpl.php index fb85452..af1a085 100644 --- a/fulcrm_shoppingcart_transaction_complete.tpl.php +++ b/fulcrm_shoppingcart_transaction_complete.tpl.php @@ -1,5 +1,24 @@
+ + + + + + + diff --git a/fulcrm_shoppingcart_transaction_incomplete.tpl.php b/fulcrm_shoppingcart_transaction_incomplete.tpl.php new file mode 100644 index 0000000..6e946ae --- /dev/null +++ b/fulcrm_shoppingcart_transaction_incomplete.tpl.php @@ -0,0 +1,77 @@ +
+ + + + + + + + + +
+ + + + + + + + + + + + + $transaction[ 'lineitems' ] ) ); } ?> + + + + + + + + +
ItemPriceQuantityTotal
+ Total + + + + $price ): ?> + + +
+ + + + + free + +
+
+ +
+
+

Information

+
+

Attempted: format( 'j/M/Y \@ g:ia' ); + else + print 'pending'; + ?>

+
+
+