Brad Arant
b0cadc3f08
JetCore engine (Tag.cpp/.h, Global.cpp/.h, __*.cpp tag classes): - Numerous __mysql.cpp connection-pooling correctness fixes (stale result sets, double-indirection sessionid bugs, field caching, pool keying) and a session-registration-before-connection-confirmed ordering fix (dangling pointer on a failed connect) - Tag.cpp: large body of fixes to the tag-dispatch/container-scanning logic (bare-name fallback, database aliasing, single-quote handling, @-prefix session variable resolution, TAGDEF caching, nested split-tag scanning for if/while/until/ifrow so an inner one doesn't corrupt an outer one's own boundary scan) plus the process-first rendering order fix (a <process> now runs before <checksession>/page resolution, fixing a real "blank page after successful login" bug) - Global.h/.cpp: added imapSessions (parallel to the existing __mysql* session map) for the new <imap> tag family - __whiledir.cpp/__include.cpp: caching and directory-name-aliasing fixes - __call.cpp/.h: fixed a dangling-pointer bug - __write.cpp: fixed an O_WRONLY-only open that couldn't create a new file - __ifrow.cpp/__sql.cpp: fixed the same sessionid double-indirection bug __mysql.cpp had (resolveKeyword's result was being used as a map key lookup instead of the resolved value itself) jetc compiler (jetc/JetParser.cpp/.h, JetCodegen.cpp/.h, JetAST.h, jetc.cpp, build-shared.sh, build-compiled.sh): - Parser fixes: inline <include>, nested-quote handling, void-tag recognition - Codegen fixes and expanded AST support - build-shared.sh: atomic rename into place for a freshly-built .jtc (a live server dlopen()ing the same path mid-rebuild was corrupting its own already-mapped view of the old file) and a staleness check so a cached JetCore .o doesn't silently keep serving yesterday's fixes forever - Added -lssl to both build scripts' link lines (needed once the new <imap> tag's client-side TLS code existed - previously nothing in this codebase used OpenSSL's SSL/TLS client API, only libcrypto) Site content (jetc/barant-site/): SPA (fetch-and-swap navigation) rollout across essentially every .page/.jet/.section/.tag/.proc/.method file - dynamic-content fixes, fragment-mode stripping, native $[@name] session variables replacing older mechanisms, and this session's own checkout.page redesign, login start-param redirect fix, and per-page side-menu (menu.bar/$[PAGE].menu) refresh support. Completed the earlier main.css/control.css move from assets/ to assets/images/ (git still showed the old paths as tracked-but-deleted until now). Deliberately left out of this commit: dozens of .pre-<description>- <date> manual backup files (this session's and earlier ones' own before/after snapshots, not meant for permanent history), compiled .jtc build outputs, ad hoc test binaries and scripts under jetc/ (login_asan, wcwc_test, optest2_bin, etc.), and jetc/__pycache__/ - none of these are meant to be tracked; a .gitignore covering them would be worth adding separately.
59 lines
2.9 KiB
Plaintext
Executable File
59 lines
2.9 KiB
Plaintext
Executable File
<sql>select i.id as invnumber,
|
|
u.name as name,
|
|
u.company_name as company_name,
|
|
u.email as email,
|
|
date_format(i.created,'%m/%e/%Y') as invdate,
|
|
i.status as status,
|
|
i.amount as amount
|
|
from invoices as i
|
|
join users as u on i.user_id=u.id
|
|
where i.id=$[_invoice_id]</sql>
|
|
<set name="amount" value="$[.amount]">
|
|
<div style="width: 500px; border: 1pt solid #000; padding: 3px; background: #fff;">
|
|
<div><div style="display: inline-block;"><img style="width: 300px;" src="/assets/invoice_logo.png"></div>
|
|
<div style="display: flex; float: right; align-items: center;">
|
|
Invoice: $[.invnumber] $[.status]
|
|
</div>
|
|
</div>
|
|
<div style="background: #eee;">
|
|
<div>Name: $[.name]</div>
|
|
<div>Company Name: $[.company_name]</div>
|
|
<div>E-Mail $[.email]</div>
|
|
<div>Invoice Date: $[.invdate]</div>
|
|
</div>
|
|
<div style="background: #ddd;">
|
|
<sql>select * from invoices_detail where invoice_id=$[_invoice_id]</sql>
|
|
<table style="border: 0px;" cellspacing="0">
|
|
<tr><td style="background-color: #888; color: #fff; width: 50px; padding:3px; text-align: center; border: 1pt solid #ddd;">Qty</td>
|
|
<td style="background-color: #888; color: #fff; width: 400px; padding: 3px; border: 1pt solid #ddd;">Description</td>
|
|
<td style="background-color: #888; color: #fff; width: 60px; padding: 3px; text-align: center; border: 1pt solid #ddd;">Unit Price</td>
|
|
<td style="background-color: #888; color: #fff; width: 60px; padding: 3px; text-align: center; border: 1pt solid #ddd;">Amount</td>
|
|
</tr>
|
|
<whilerow>
|
|
<tr><td style="width: 50px; vertical-align: top; text-align: center; border: 1pt solid #ddd;">
|
|
<if value1="$[.sku]" value2="***" type="ne">$[quantity]</if></td>
|
|
<td style="width: 400px; border: 1pt solid #ddd;">
|
|
<if value1="$[.sku]" value2="***" type="ne">$[description]<br></if>
|
|
$[text]</td>
|
|
<td style="width: 60px; vertical-align: top; text-align: right; border: 1pt solid #ddd;">
|
|
<if value1="$[.sku]" value2="***" type="ne">$[price]</if></td>
|
|
<td style="width: 60px; vertical-align: top; text-align: right; border: 1pt solid #ddd;">$[total]</td>
|
|
</tr>
|
|
</whilerow>
|
|
<tr><td style="width: 50px; border: 0pt solid #000;"></td>
|
|
<td style="width: 400px; text-align: right; border: 0pt solid #000;" colspan="2">Invoice Total:</td>
|
|
<td style="width: 60px; text-align: right; border: 1pt solid #000;">$[amount]</td>
|
|
</tr>
|
|
<tr><td colspan="4" style="width: 50px; border: 0pt solid #000;"><hr></td>
|
|
</tr>
|
|
<sql>select * from payments where invoice_id=$[_invoice_id]</sql>
|
|
<whilerow>
|
|
<tr><td style="width: 50px; border: 0pt solid #000;"></td>
|
|
<td colspan="2" style="width: 400px; text-align: right; border: 0pt solid #000;">Credit Card: $[.card_brand] ending in $[.last_4_digits] expires on $[.exp_month]/$[.exp_year]</td>
|
|
<td style="width: 60px; text-align: right; border: 1pt solid #000;">$[.amount]</td>
|
|
</tr>
|
|
</whilerow>
|
|
</table>
|
|
</div>
|
|
</div>
|