Merge branch 'master' of bitbucket.org:venbainformationtechnology/golf_backend

app/Controllers/Test_controller.php

@@ -37,36 +37,28 @@ class Test_controller extends BaseController
     {
 		
 		
-		$count = $this->request->getVar('count');
+		$TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->findAll();
-		foreach ($count as $key => $value) 
+		$data['TransactionData'] = []; 
-		{
+		foreach ($TransactionData as $TransactionDatakey => $TransactionDatavalue) {
-			$this->Cart_token_model->where('id', $this->request->getVar('cart_token_id')[$key] )->set(array( 'count' => $value ))->update();
+			$credit_data =  $this->creditsModel->where('member_id', session()->get('logged_user'))
+												->select('package_name')
+												->select('cost')
+												->select('credit_points')
+												->select('expiring_date')
+												->selectSum('credit_points', 'creditPointsSum')
+												->selectSum('cost', 'costSum')
+												->selectCount('package_name', 'pack_count')
+												->groupBy('package_name')
+			                                    ->where('order_id',$TransactionDatavalue['order_id'])
+											    ->where('is_active',1)->findAll();
+			$TransactionDatavalue['credit_data'] = $credit_data;
+			array_push($data['TransactionData'] ,$TransactionDatavalue);
 		}
-        if(!session()->has('logged_user'))
+                echo '<pre>';
-		{
+                print_r(  $data);
-			$this->session->set('token',$token);
+                echo '</pre>';
-			return redirect()->to(base_url());
+                die();
-		}
+
-        else 
-        {
-			if ($token)
-			{
-				$tokendata =  $this->Cart_token_model->where('md5(token)', $token )->findAll();
-				foreach ($tokendata as $value) 
-				{  
-					$data['member_id'] = $this->session->get('logged_user',);
-					$data['pack_id'] = $value['primary_id'];
-					$data['count'] = $value['count'];
-					$successdata = $this->cartModel->save($data);
-					if ($successdata) 
-					{
-						$deletedata =  $this->Cart_token_model->where('id', $value['id'] )->delete();
-					} 
-				}
-				// return redirect()->to(base_url().'payment');
-			} 
-        }
-        
 
     }
 	// -----------------------------------------------

app/Views/member_layout/header.php

@@ -11,7 +11,7 @@
                     <div class="col-lg-5 header1">
                         <ul>
                             <li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
-                            <li><a href="https://golfevolutionkelowna.ca/evo-membership/">Pre-Sales Offer</a></li>
+                            <li><a href="<?= base_url('membership');?>">Pre-Sales Offer</a></li>
                         </ul>
                     </div>
 
@@ -59,7 +59,7 @@
             <div class="col-lg-12">
                 <ul>
                     <li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
-                    <li><a href="https://golfevolutionkelowna.ca/evo-membership/">Pre-Sales Offer</a></li>
+                    <li><a href="<?= base_url('membership');?>">Pre-Sales Offer</a></li>
                     <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
                     <li><a href="https://golfevolutionkelowna.ca/contact-us/">Contact Us</a> </li>                    
                 </ul>