mark/HotLunches
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base_school_num changes

Browse Source
This commit is contained in:
mark committed 2026-10-20 17:31:06 -07:00
1 parent 57853ca5c6
commit ecea902d50
8 files changed
+27 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ppPayment.php
+5 -5
View File
@@ -842,7 +842,7 @@
} }
// Update users record to indicate that there are pending transactions // Update users record to indicate that there are pending transactions
$query = "update users set trx_status = 'Pending' where school_num = $p_school_num and record_num = $p_user_num"; $query = "update users set trx_status = 'Pending' where record_num = $p_user_num";
pp_query($query); pp_query($query);
echo("Pending Payment Status: $P_payment_status\n"); echo("Pending Payment Status: $P_payment_status\n");
exit(); exit();
@@ -876,7 +876,7 @@
} }
// Update users record to clear the pending status // Update users record to clear the pending status
$query = "update users set trx_status = '' where school_num = $p_school_num and record_num = $p_user_num"; $query = "update users set trx_status = '' where record_num = $p_user_num";
pp_query($query); pp_query($query);
echo("Failed Payment Status: $P_payment_status\n"); echo("Failed Payment Status: $P_payment_status\n");
exit(); exit();
@@ -1009,7 +1009,7 @@
// Make activity_log entry // Make activity_log entry
$username = pp_getVal("SELECT userid FROM users WHERE school_num = $p_school_num AND record_num = $p_user_num"); $username = pp_getVal("SELECT userid FROM users WHERE record_num = $p_user_num");
$activity = "PayPal Payment"; $activity = "PayPal Payment";
$additional_info = "TRX ID: $P_txn_id\nAmount: " . number_format(abs($amount),2) . "\n"; $additional_info = "TRX ID: $P_txn_id\nAmount: " . number_format(abs($amount),2) . "\n";
$curr_time = $ptime; $curr_time = $ptime;
@@ -1020,11 +1020,11 @@
pp_query($query); pp_query($query);
// Reset user transaction status // Reset user transaction status
$query = "update users set trx_status = NULL where school_num = $p_school_num and record_num = $p_user_num"; $query = "update users set trx_status = NULL where record_num = $p_user_num";
pp_query($query); pp_query($query);
// Reset user can_order flag // Reset user can_order flag
$query = "update users set can_order = 'Yes' where school_num = $p_school_num and can_order = 'Balance' and record_num = $p_user_num"; $query = "update users set can_order = 'Yes' where can_order = 'Balance' and record_num = $p_user_num";
pp_query($query); pp_query($query);
// Update user_paypal_transactions // Update user_paypal_transactions
supplier_orders.post.php
+10 -1
View File
@@ -73,12 +73,21 @@ fwrite($fp,"\n");
// Set estimated totals to zero // Set estimated totals to zero
$query = "update supplier_order_header " . if (isset($delivery_date) && strlen($delivery_date) > 0) {
$query = "update supplier_order_header " .
"set estimated_total = 0, " . "set estimated_total = 0, " .
"delivery_date = '$delivery_date' " . "delivery_date = '$delivery_date' " .
"where school_num = $school_num " . "where school_num = $school_num " .
"and schedule_num = $schedule_num " . "and schedule_num = $schedule_num " .
"and menu_num = $curr_menu_num"; "and menu_num = $curr_menu_num";
}
else {
$query = "update supplier_order_header " .
"set estimated_total = 0 " .
"where school_num = $school_num " .
"and schedule_num = $schedule_num " .
"and menu_num = $curr_menu_num";
}
// db_query("START TRANSACTION"); // db_query("START TRANSACTION");
db_query($query); db_query($query);
// db_query("COMMIT"); // db_query("COMMIT");
user_account.form.php
+3 -3
View File
@@ -224,7 +224,7 @@ include "form.messages.php";
<optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>">
<?php BuildFileList("transaction_types_charges.txt",$transaction_type) ?> <?php BuildFileList("transaction_types_charges.txt",$transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Charge' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Charge' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -238,7 +238,7 @@ include "form.messages.php";
<optgroup label="<?php displayLanguageText('TEXT-PAYMENTS-AND-CREDITS'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-PAYMENTS-AND-CREDITS'); ?>">
<?php BuildFileList("transaction_types_payments.txt",$transaction_type) ?> <?php BuildFileList("transaction_types_payments.txt",$transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Credit' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Credit' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -252,7 +252,7 @@ include "form.messages.php";
<optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>">
<?php BuildFileList("transaction_types_other.txt",$transaction_type) ?> <?php BuildFileList("transaction_types_other.txt",$transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Note' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Note' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
user_account.payment.detail.report.php
+3 -3
View File
@@ -174,7 +174,7 @@ while ($row = db_fetch_array($results)) {
<optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>">
<?php BuildFileList("transaction_types_charges.txt",$selected_transaction_type) ?> <?php BuildFileList("transaction_types_charges.txt",$selected_transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Charge' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Charge' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -190,7 +190,7 @@ while ($row = db_fetch_array($results)) {
<?php if ($selected_transaction_type == 'Complimentary Credit') $selected = " selected='selected'"; ?> <?php if ($selected_transaction_type == 'Complimentary Credit') $selected = " selected='selected'"; ?>
<option value='Complimentary Credit'<?php echo($selected) ?>>Complimentary Credit</option> <option value='Complimentary Credit'<?php echo($selected) ?>>Complimentary Credit</option>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Credit' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Credit' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -204,7 +204,7 @@ while ($row = db_fetch_array($results)) {
<optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>">
<?php BuildFileList("transaction_types_other.txt",$selected_transaction_type) ?> <?php BuildFileList("transaction_types_other.txt",$selected_transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Note' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Note' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
user_account.php
+1 -1
View File
@@ -754,7 +754,7 @@ switch (strtolower($naction)) {
$uset = ""; $uset = "";
$ukey = "user_num_$trx_num"; $ukey = "user_num_$trx_num";
if (array_key_exists($ukey, $_POST) && $_POST[$ukey] > 0) $uset = ", user_num = " . $_POST[$ukey]; if (array_key_exists($ukey, $_POST) && $_POST[$ukey] > 0) $uset = ", user_num = " . $_POST[$ukey];
$query = "UPDATE user_account SET schedule_num = $val$uset WHERE school_num = $base_school_num AND user_num = $user_num AND record_num = $trx_num"; $query = "UPDATE user_account SET schedule_num = $val$uset WHERE school_num = $school_num AND user_num = $user_num AND record_num = $trx_num";
db_query($query); db_query($query);
} }
} }
user_account.report.php
+3 -3
View File
@@ -188,7 +188,7 @@ while ($row = db_fetch_array($results)) {
<optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-CHARGES-AND-FEES'); ?>">
<?php BuildFileList("transaction_types_charges.txt",$selected_transaction_type) ?> <?php BuildFileList("transaction_types_charges.txt",$selected_transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Charge' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Charge' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -204,7 +204,7 @@ while ($row = db_fetch_array($results)) {
<?php if ($selected_transaction_type == 'Complimentary Credit') $selected = " selected='selected'"; ?> <?php if ($selected_transaction_type == 'Complimentary Credit') $selected = " selected='selected'"; ?>
<option value='Complimentary Credit'<?php echo($selected) ?>>Complimentary Credit</option> <option value='Complimentary Credit'<?php echo($selected) ?>>Complimentary Credit</option>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Credit' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Credit' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
@@ -218,7 +218,7 @@ while ($row = db_fetch_array($results)) {
<optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>"> <optgroup label="<?php displayLanguageText('TEXT-OTHER'); ?>">
<?php BuildFileList("transaction_types_other.txt",$selected_transaction_type) ?> <?php BuildFileList("transaction_types_other.txt",$selected_transaction_type) ?>
<?php <?php
$r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $base_school_num AND trx_category = 'Note' ORDER BY sequence"); $r = db_query("SELECT * FROM user_account_trx_codes WHERE school_num = $school_num AND trx_category = 'Note' ORDER BY sequence");
if (db_num_rows($r)) { if (db_num_rows($r)) {
while ($row = db_fetch_assoc($r)) { while ($row = db_fetch_assoc($r)) {
$transaction_type_code = $row['transaction_type_code']; $transaction_type_code = $row['transaction_type_code'];
view_docs.php
+1 -1
View File
@@ -21,7 +21,7 @@ $templatePageTitle = getLanguageText('DOCUMENTS-TITLE');
$query = "select d.*,dc.category,dc.sequence " . $query = "select d.*,dc.category,dc.sequence " .
"from documents as d, document_categories as dc " . "from documents as d, document_categories as dc " .
"where d.school_num = $school_num " . "where d.school_num = $school_num " .
"and dc.school_num = $base_school_num " . "and dc.school_num = $school_num " .
"and d.category_num = dc.record_num " . "and d.category_num = dc.record_num " .
$status_where . $status_where .
"order by dc.sequence,d.sequence,document_date desc,title"; "order by dc.sequence,d.sequence,document_date desc,title";
welcome.php
+1 -1
View File
@@ -461,7 +461,7 @@ else {
} }
if (in_array($_SESSION['UserInfo']['type'],array('SuperUser','System Administrator'))) { if (in_array($_SESSION['UserInfo']['type'],array('SuperUser','System Administrator'))) {
$current_balance_owing = db_getVal("SELECT sum(total - amount_paid) FROM invoice_header WHERE school_num = $base_school_num AND status = 'Open'"); $current_balance_owing = db_getVal("SELECT sum(total - amount_paid) FROM invoice_header WHERE school_num = $school_num AND status = 'Open'");
if ($current_balance_owing > 0) { if ($current_balance_owing > 0) {
// Format school_year value // Format school_year value
if (date("m",time()) < '12') { if (date("m",time()) < '12') {