webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crewsportswear update as of 3_18_19

Browse Source
This commit is contained in:
Frank John Begornia
2019-03-18 13:48:37 +08:00
parent 562f03488a
commit a2d88bc52e
71 changed files with 5443 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
app/Http/Controllers/designer/DesignerController.php
View File

@@ -996,5 +996,102 @@ class DesignerController extends Controller {
<?php
}
public function addNewRowNameAndNumber(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name" >
</td>
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-name-and-number btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_name_and_number" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
public function addNewRowNameNumberAndSize(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name" >
</td>
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td>
<select class="form-control input-sm order-size roster-input" name="order_size[]" id="<?php echo 'order_size_' . $trCount ?>" data-row-number="<?php echo $trCount ?>">
<?php
foreach($jersey_sizes as $j_size){
echo '<option value="'.$j_size.'">'.$j_size.'</option>';
}
?>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-name-and-number btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_name_and_number" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
}

132
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -6,10 +6,13 @@ use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Paypal;
use App\Models\teamstore\TeamStoreModel;
use App\Models\user\UserModel;
use App\Models\paypal\PayPalModel;
use Auth;
use Session;
use Redirect;
use Mail;
class PaypalController extends Controller {
@@ -66,7 +69,10 @@ class PaypalController extends Controller {
$m = new TeamStoreModel;
$cartKey = $request->session()->get('cartkey');
$paypal_model = new PayPalModel;
$last_id = $paypal_model->getLastIdPaymentDetails();
$invoice_num = str_pad($last_id[0]->Id, 4,'0',STR_PAD_LEFT);
$cartKey = $request->session()->get('cartkey');
$items = $m->myCart($cartKey);
$getSubtotal = $m->getSubtotal($cartKey);
@@ -76,6 +82,8 @@ class PaypalController extends Controller {
$order_subtotal = $getSubtotal[0]->Subtotal;
$order_grandtotal = $getSubtotal[0]->Subtotal;
$tax = $order_grandtotal * 0.10;
$order_items = array();
foreach($items as $key => $item){
@@ -98,25 +106,30 @@ class PaypalController extends Controller {
$order_items[$key]->setCurrency('USD');
$order_items[$key]->setQuantity($item->Quantity);
// $order_items[$key]->setDescription($descriptions);
// $order_items[$key]->setTax(10);
$order_items[$key]->setPrice($item->Price);
}
$item_list = PayPal::ItemList();
$item_list->setItems($order_items);
$amount_details = PayPal::Details();
$amount_details->setSubtotal($order_subtotal);
$amount_details->setTax($tax);
$amount = PayPal::Amount();
$amount->setCurrency('USD');
$amount->setDetails($amount_details);
$amount->setTotal($order_grandtotal);
$amount->setTotal($order_grandtotal + $tax);
$transaction = PayPal::Transaction();
$transaction->setAmount($amount);
$transaction->setItemList($item_list);
$transaction->setDescription('Your transaction description');
$transaction->setInvoiceNumber(date('Y') . '-' . uniqid());
// $transaction->setDescription('Your transaction description');
$transaction->setInvoiceNumber(date('Ymd') . '-' . $invoice_num);
$redirectUrls = PayPal:: RedirectUrls();
$redirectUrls->setReturnUrl(route('getDone'));
@@ -188,22 +201,48 @@ class PaypalController extends Controller {
// }
$obj = json_decode($executePayment);
$line2 = null;
//details
$total = $obj->transactions[0]->amount->total;
$sub_total = $obj->transactions[0]->amount->details->subtotal;
$tax = $obj->transactions[0]->amount->details->tax;
$currency = $obj->transactions[0]->amount->currency;
$invoice_number = $obj->transactions[0]->invoice_number;
// var_dump($obj->transactions[0]->amount);
//shipping address details
$recipient_name = $obj->transactions[0]->item_list->shipping_address->recipient_name;
$line1 = $obj->transactions[0]->item_list->shipping_address->line1;
if(isset($obj->transactions[0]->item_list->shipping_address->line2)){
$line2 = $obj->transactions[0]->item_list->shipping_address->line2;
}
$city = $obj->transactions[0]->item_list->shipping_address->city;
$state = $obj->transactions[0]->item_list->shipping_address->state;
$postal_code = $obj->transactions[0]->item_list->shipping_address->postal_code;
$country_code = $obj->transactions[0]->item_list->shipping_address->country_code;
// payer info
$payment_method = $obj->payer->payment_method;
$email = $obj->payer->payer_info->email;
$first_name = $obj->payer->payer_info->first_name;
$last_name = $obj->payer->payer_info->last_name;
$_payer_id = $obj->payer->payer_info->payer_id;
/// end paypal codes
$paypal_model = new PayPalModel;
$m = new TeamStoreModel;
$cartKey = $request->session()->get('cartkey');
$userId = Auth::user()->id;
$user_email = Auth::user()->email;
$items = $m->myCart($cartKey); // item from cart_tmp
$getSubtotal = $m->getSubtotal($cartKey);
$payment_details = array(
'UserId' => $userId,
'CartKey' => $cartKey,
'PaymentId' => $id,
@@ -211,39 +250,66 @@ class PaypalController extends Controller {
'PayerId' => $payer_id,
'InvoiceNumber' => $invoice_number,
'Currency' => $currency,
'Total' => $total
'Total' => $total,
'SubTotal' => $sub_total,
'Tax' => $tax,
'Payer_Email' => $email,
'Payer_Firstname' => $first_name,
'Payer_Lastname' => $last_name,
'PaymentMethod' =>$payment_method
);
$i = $paypal_model->insertToPaypalDetails($payment_details);
// var_dump($i);
// foreach($items as $key => $val){
// $orders[] = array(
// 'Order' => $val->Order,
// 'ProductId' => $val->ProductId,
// 'CartKey' => $val->CartKey,
// 'ProductURL' => $val->ProductURL,
// 'TeamName' => $val->TeamName,
// 'Name' => $val->Name,
// 'Number' => $val->Number,
// 'Size' => $val->Size,
// 'Price' => $val->Price,
// 'Quantity' => $val->Quantity,
// );
// }
$p_id = $paypal_model->insertToPaypalDetails($payment_details);
$shipping_address = array(
'PaymentDetail_Id' => $p_id,
'recipient_name' => $recipient_name,
'line1' => $line1,
'line2' => $line2,
'city' => $city,
'state' => $state,
'postal_code' => $postal_code,
'country_code' => $country_code,
);
// iinsert shipping address
$paypal_model->insertShippingAddress($shipping_address);
// insert order from cart_tmp to orders table
$l = $paypal_model->insertToOrders($cartKey); // insert to orders table
//email sending
$newUserModel = new UserModel;
$order_item_array = $newUserModel->selectOrderItem($cartKey);
$item_goup_array = $newUserModel->itemGroup($cartKey);
$item_thumbs = $newUserModel->selectDisplayItemThumb();
$array_payment_details = $newUserModel->selectPaymentDetails('CartKey', $cartKey);
var_dump($items);
$data = array(
'order_item_array' => $order_item_array,
'item_goup_array' => $item_goup_array,
'img_thumb' => $item_thumbs,
'array_payment_details' => $array_payment_details,
'receiver' => $user_email,
'subject' => 'Order Details',
);
Mail::send('emails.orders', $data, function($message) use ($data) {
$message->from('no-reply@crewsportswear.com', 'CREW Sportswear');
$message->cc('orders@crewsportswear.com', 'Orders From CREW Sportswear');
$message->to($data['receiver'])->subject('Order Details');
// $paypal_model->insertToOrders($items); // insert to orders table
});
// end email sending
$request->session()->forget('cartkey'); // clear session for cartkey
// $request->session()->forget('cartkey'); // clear session for cartkey
// return view('paypal.get_done')
// ->with('currency', $currency)
// ->with('total', $total);
// redirect to thank you page.
return view('paypal.get_done')
->with('currency', $currency)
->with('total', $total);
}

51
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -293,6 +293,50 @@ class TeamStoreController extends Controller {
'Price' => $ProductPrice,
'Quantity' => $post['quantity']
);
}elseif($product_form == "name-number-form"){
$order_names = $post['order_names'];
$order_number = $post['order_number'];
foreach($order_names as $key => $val){
$items[] = array(
'ProductId' => $product_id,
'StoreURL' => $store_url,
'FormUsed' => $product_form,
'CartKey' => $cartKey,
'DesignCode' => $design_code,
'ProductURL' => $ProductURL,
'ProductName' => $product_name,
'Name' => $order_names[$key],
'Number' => $order_number[$key],
'Price' => $ProductPrice,
'Quantity' => 1
);
}
}elseif($product_form == "name-number-size-form"){
$order_names = $post['order_names'];
$order_number = $post['order_number'];
$order_size = $post['order_size'];
foreach($order_names as $key => $val){
$items[] = array(
'ProductId' => $product_id,
'StoreURL' => $store_url,
'FormUsed' => $product_form,
'CartKey' => $cartKey,
'DesignCode' => $design_code,
'ProductURL' => $ProductURL,
'ProductName' => $product_name,
'Name' => $order_names[$key],
'Size' => $order_size[$key],
'Number' => $order_number[$key],
'Price' => $ProductPrice,
'Quantity' => 1
);
}
}
@@ -320,12 +364,13 @@ class TeamStoreController extends Controller {
$items = $m->myCart($cartKey);
$getSubtotal = $m->getSubtotal($cartKey);
$items_group = $m->myCartGroup($cartKey);
// var_dump($items_group);
$items_group = $m->myCartGroup($cartKey);
$item_thumbs = $m->selectDisplayCartThumb();
return view('sublayouts.cart')
->with('item_group', $items_group)
->with('row', $items)
->with('img_thumb', $item_thumbs)
->with('getSubtotal', $getSubtotal);
}

15
app/Http/Controllers/user/UserController.php
View File

@@ -200,7 +200,7 @@ class UserController extends Controller {
public function orders(){
$m = new UserModel;
$userId = Auth::user()->id;
$array_payment_details = $m->selectPaymentDetails($userId);
$array_payment_details = $m->selectPaymentDetails('UserId', $userId);
// var_dump($array_payment_details);
@@ -438,5 +438,18 @@ class UserController extends Controller {
));
}
}
public function orderDetails($ck){
$newUserModel = new UserModel;
$order_item_array = $newUserModel->selectOrderItem($ck);
$item_goup_array = $newUserModel->itemGroup($ck);
$item_thumbs = $newUserModel->selectDisplayItemThumb();
$array_payment_details = $newUserModel->selectPaymentDetails('CartKey', $ck);
return view('user-layouts.order_details')
->with('array_payment_details', $array_payment_details)
->with('img_thumb', $item_thumbs)
->with('item_goup_array', $item_goup_array)
->with('order_item_array', $order_item_array);
}
}

4
app/Http/routes.php
View File

@@ -50,6 +50,9 @@ Route::get('/designer/edit/{designCode}', 'designer\DesignerController@editDesig
// CUSTOMIZER DISPLAY
Route::post('/designer/a/add-new-row', 'designer\DesignerController@addNewRow');
Route::post('/designer/a/add-new-row-name-and-number', 'designer\DesignerController@addNewRowNameAndNumber');
Route::post('/designer/a/add-new-row-name-number-size', 'designer\DesignerController@addNewRowNameNumberAndSize');
Route::post('/designer/a/save-roster', 'designer\DesignerController@saveRoster');
Route::group(['middleware' => ['auth']], function() {
@@ -103,6 +106,7 @@ Route::group(['middleware' => 'normaluser'], function () {
Route::get('user/profile/change-password', 'user\UserController@changePassword');
Route::post('user/profile/update-password', 'user\UserController@updatePassword');
Route::get('user/orders', 'user\UserController@orders');
Route::get('user/orders/view/{ck}', 'user\UserController@orderDetails');
Route::get('user/my-designs', 'user\UserController@myDesigns');
Route::get('user/my-designs/view/{id}', 'user\UserController@viewDesign');
Route::post('user/my-designs/update', 'user\UserController@updateDesignDetails');