Minor cleanup (whitespace, comments)
This commit is contained in:
parent
8eec645c40
commit
36d84001a2
|
@ -427,8 +427,8 @@ class Basket_Controller extends Controller {
|
||||||
|
|
||||||
// redirect to paypal
|
// redirect to paypal
|
||||||
// NOT USED END ===============================
|
// NOT USED END ===============================
|
||||||
}else
|
}
|
||||||
{
|
else{
|
||||||
$form = new Forge("basket/complete", "", "post", array("id" => "confirm", "name" =>"confirm"));
|
$form = new Forge("basket/complete", "", "post", array("id" => "confirm", "name" =>"confirm"));
|
||||||
$view = new View("confirm_order.html");
|
$view = new View("confirm_order.html");
|
||||||
$view->basket = $basket;
|
$view->basket = $basket;
|
||||||
|
@ -437,8 +437,7 @@ class Basket_Controller extends Controller {
|
||||||
print $template;
|
print $template;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else{
|
||||||
{
|
|
||||||
die("Invalid confirmation!");
|
die("Invalid confirmation!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -333,6 +333,7 @@ class basket_Core {
|
||||||
static function getOrderPaidEmail(){
|
static function getOrderPaidEmail(){
|
||||||
return module::get_var("basket","order_paid_email");
|
return module::get_var("basket","order_paid_email");
|
||||||
}
|
}
|
||||||
|
|
||||||
static function getOrderPaidEmailSubject(){
|
static function getOrderPaidEmailSubject(){
|
||||||
return module::get_var("basket","order_paid_email_subject");
|
return module::get_var("basket","order_paid_email_subject");
|
||||||
}
|
}
|
||||||
|
@ -428,13 +429,13 @@ class basket_Core {
|
||||||
|
|
||||||
//Added 2011-10-02
|
//Added 2011-10-02
|
||||||
static function deliveryMethod($order) {
|
static function deliveryMethod($order) {
|
||||||
//@TODO: configurable delivery methods
|
//@TODO: configurable delivery methods
|
||||||
if ($order->method == Order_Model::DELIVERY_MAIL) {$delivery_method = "verstuurd per post";}
|
if ($order->method == Order_Model::DELIVERY_MAIL) {$delivery_method = "verstuurd per post";}
|
||||||
elseif ($order->method == Order_Model::DELIVERY_EMAIL) {$delivery_method = "verstuurd per e-mail";}
|
elseif ($order->method == Order_Model::DELIVERY_EMAIL) {$delivery_method = "verstuurd per e-mail";}
|
||||||
elseif ($order->method == Order_Model::DELIVERY_PICKUP) {$delivery_method = "klaargelegd om af te halen bij ".basket::getPickupLocation()."";}
|
elseif ($order->method == Order_Model::DELIVERY_PICKUP) {$delivery_method = "klaargelegd om af te halen bij ".basket::getPickupLocation()."";}
|
||||||
else {$delivery_method = "GEEN LEVERINGSWIJZE BEKEND";}
|
else {$delivery_method = "GEEN LEVERINGSWIJZE BEKEND";}
|
||||||
return $delivery_method;
|
return $delivery_method;
|
||||||
}
|
}
|
||||||
|
|
||||||
static function setWebshop($webshop){
|
static function setWebshop($webshop){
|
||||||
module::set_var("basket","webshop",$webshop);
|
module::set_var("basket","webshop",$webshop);
|
||||||
|
@ -542,7 +543,6 @@ class basket_Core {
|
||||||
}
|
}
|
||||||
|
|
||||||
static function createOrder($basket, $method){
|
static function createOrder($basket, $method){
|
||||||
|
|
||||||
// fill customer record; added 2011-08-20
|
// fill customer record; added 2011-08-20
|
||||||
$customer = ORM::factory("customer");
|
$customer = ORM::factory("customer");
|
||||||
$customer->title=$basket->title;
|
$customer->title=$basket->title;
|
||||||
|
@ -697,7 +697,7 @@ Bestelde foto's:";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function send_invoice_copy($order){
|
public function send_invoice_copy($order){
|
||||||
// order confirmation mail to customer
|
// copy of order confirmation mail to customer
|
||||||
$to = $order->email;
|
$to = $order->email;
|
||||||
$from = "From: ".basket::getEmailAddress();
|
$from = "From: ".basket::getEmailAddress();
|
||||||
$subject = basket::replaceStringsAll(basket::getOrderCompleteEmailSubject(),$order);
|
$subject = basket::replaceStringsAll(basket::getOrderCompleteEmailSubject(),$order);
|
||||||
|
|
|
@ -73,10 +73,8 @@ class Order_Model extends ORM {
|
||||||
//return "offline";
|
//return "offline";
|
||||||
return "Overmaking - versturen per post";
|
return "Overmaking - versturen per post";
|
||||||
case 3:
|
case 3:
|
||||||
//return "offline";
|
|
||||||
return "Overmaking - versturen per e-mail";
|
return "Overmaking - versturen per e-mail";
|
||||||
case 4:
|
case 4:
|
||||||
//return "offline";
|
|
||||||
return "Overmaking - afhalen";
|
return "Overmaking - afhalen";
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Reference in New Issue
Block a user