Changeset 2742

Timestamp:

02/13/10 15:53:05 (2 years ago)

Author:

areski

Message:

indent

Files:

• trunk/common/lib/Form/Class.FormBO.php (modified) (6 diffs)
• trunk/customer/checkout_process.php (modified) (12 diffs)

trunk/common/lib/Form/Class.FormBO.php

@@ -378 +378 @@
-                
-                self::create_subscriptions();
-                
-        }
-        
@@ -390 +389 @@
-                $subscription_clause = "id = ".$subscriber;
-                $result_sub = $table_subscription->Get_list($FormHandler->DBHandle, $clause);
-
+
-                if (is_numeric($subscriber) && is_array($result_sub) && $result_sub[0]['fee'] > 0) {
-
@@ -407 +406 @@
-                        $limite_pay_date = date("Y-m-d",strtotime(" + $billdaybefor_anniversery day")) ;
-
->$lastday_of_next_month)
+ > $lastday_of_next_month) 
-                                $next_limite_pay_date = date ("$lastday_of_next_month-m-Y" ,$next_bill_date);
-                        } else {
@@ -427 +426 @@
-                        $instance_subscription_table -> Add_table ($FormHandler->DBHandle, $value_insert, null, null);  
-                        $reference = generate_invoice_reference();
+
-                        //CREATE INVOICE If a new card then just an invoice item in the last invoice
-                        $field_insert = "date, id_card, title, reference, description, status, paid_status";
@@ -435 +435 @@
-                        $instance_table = new Table("cc_invoice", $field_insert);
-                        $id_invoice = $instance_table->Add_table($FormHandler->DBHandle, $value_insert, null, null, "id");
+
-                        if (!empty ($id_invoice) && is_numeric($id_invoice)) {
-                                $description = "Subscription service";
@@ -453 +454 @@
-                        $mail -> replaceInEmail(Mail::$SUBSCRIPTION_ID,$subscription['id']);
-                        $mail -> replaceInEmail(Mail::$SUBSCRIPTION_LABEL,$subscription['product_name']);
+
-                        //insert charge
-                        $QUERY = "INSERT INTO cc_charge (id_cc_card, amount, chargetype, id_cc_card_subscription, invoiced_status) VALUES ('" . $card_id . "', '" . $subscription['fee']  . "', '3','" . $subscription['card_subscription_id'] . "',1)";

trunk/customer/checkout_process.php

@@ -39 +39 @@
-
-
-
-
-
+
-
-if ($sess_id =="") {
@@ -236 +234 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
-$amount_paid = convert_currency($currencies_list, $currAmount, $currCurrency, BASE_CURRENCY);
-$amount_without_vat = $amount_paid / (1+$VAT/100);
@@ -277 +276 @@
-
-$QUERY = "SELECT username, credit, lastname, firstname, address, city, state, country, zipcode, phone, email, fax, lastuse, activated, currency, useralias, uipass " .
-
-
-
+
-$resmax = $DBHandle_max -> Execute($QUERY);
-if ($resmax) {
@@ -293 +290 @@
-
-$orderStatus = $payment_modules->get_OrderStatus();
-
-
+
+
+
+
-
-$Query = "INSERT INTO cc_payments ( customers_id, customers_name, customers_email_address, item_name, item_id, item_quantity, payment_method, cc_type, cc_owner, " .
@@ -305 +304 @@
-
-
-************************UPDATE THE CREDIT IN THE CARD***********************
+ UPDATE THE CARD CREDIT
-$id = 0;
-if ($customer_info[0] > 0 && $orderStatus == 2) {
@@ -322 +321 @@
-if ($id > 0 ) {
-        if (strcasecmp("invoice",$item_type)!=0) {
-                
-            $addcredit = $transaction_data[0][2]; 
-                $instance_table = new Table("cc_card", "username, id");
@@ -335 +333 @@
-                        $id_agent =  $result_agent[0]['id_agent'];
-                        $id_agent_insert = "'$id_agent'";
-else
+ else 
-                        $id_agent = null;
-                        $id_agent_insert = "NULL";
@@ -376 +374 @@
-                $values = " $id_invoice, $id_payment    ";
-                $table_payment_invoice->Add_table($DBHandle, $values, $fields);
-                
-                //END INVOICE
-
-test if this card have a agent
-
+
+Agent commision
+// test if this card have a agent              
-                if (!empty($id_agent)) {
+
-                        //test if the agent exist and get its commission
-                        $agent_table = new Table("cc_agent", "commission");
@@ -387 +385 @@
-                        $result_agent= $agent_table -> Get_list($DBHandle,$agent_clause);
-                        if(is_array($result_agent) && is_numeric($result_agent[0]['commission']) && $result_agent[0]['commission']>0) {
+
-                                $field_insert = "id_payment, id_card, amount,description,id_agent,commission_percent,commission_type";
-                                $commission = ceil(($amount_without_vat * ($result_agent[0]['commission'])/100)*100)/100;
-                                $commission_percent = $result_agent[0]['commission'];
+
-                                $description_commission = gettext("AUTOMATICALY GENERATED COMMISSION!");
-                                $description_commission.= "\nID CARD : ".$id;
@@ -395 +395 @@
-                                $description_commission.= "\nPAYMENT AMOUNT: ".$amount_without_vat;
-                                $description_commission.= "\nCOMMISSION APPLIED: ".$commission_percent;
+
-                                $value_insert = "'".$id_payment."', '$id', '$commission','$description_commission','$id_agent','$commission_percent','0'";
-                                $commission_table = new Table("cc_agent_commission", $field_insert);
-                                $id_commission = $commission_table -> Add_table ($DBHandle, $value_insert, null, null,"id");
-                                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_agent_commission : $field_insert - VALUES $value_insert");
+
-                                $table_agent = new Table('cc_agent');
-                                $param_update_agent = "com_balance = com_balance + '".$commission."'";
@@ -412 +414 @@
-                        $invoice_clause = "id = ".$item_id;
-                        $result_invoice = $invoice_table->Get_list($DBHandle,$invoice_clause);
+                        
-                        if (is_array($result_invoice) && sizeof($result_invoice)==1) {
-
-
-                                $reference =$result_invoice[0][0];
-                                
@@ -422 +423 @@
-                                $id_payment = $instance_sub_table -> Add_table ($DBHandle, $value_insert, null, null,"id");
-                                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_logpayment : $field_insert - VALUES $value_insert");
-
-
+
+//update invoice to paid
-                                $invoice = new Invoice($item_id);
-                                $invoice -> addPayment($id_payment);
-                                $invoice -> changeStatus(1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-                }
-        }
-}
-//*************************END UPDATE CREDIT************************************
-
-$_SESSION["p_amount"] = null;