Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Cyd/2025polish #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cydoval merged 23 commits into from
Nov 21, 2025
Merged

Cyd/2025polish #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3428a09
button pre work
cydoval Nov 19, 2025
1ff8a04
Merge branch 'master' into cyd/2025polish
cydoval Nov 19, 2025
a71c57f
lots of bootstrap cleaning
cydoval Nov 20, 2025
c18cb7c
button cleaning
cydoval Nov 20, 2025
f8401d8
cleaning invoice
cydoval Nov 20, 2025
d28b694
more cleanup
cydoval Nov 20, 2025
bffb8cc
Update src/Payments.Mvc/Views/System/Index.cshtml
cydoval Nov 20, 2025
2178779
code rabbit suggestion
cydoval Nov 20, 2025
cc6b32e
Merge branch 'cyd/2025polish' of https://github.com/ucdavis/payments …
cydoval Nov 20, 2025
fc5cb47
reports fix
cydoval Nov 20, 2025
1260035
vertical team
cydoval Nov 20, 2025
5739a0a
reports cleanup
cydoval Nov 20, 2025
e3293ca
margins gone
cydoval Nov 20, 2025
60c4513
cleaner icon spacing
cydoval Nov 20, 2025
f812eb8
square one button spacing
cydoval Nov 20, 2025
17a0641
btn fixing
cydoval Nov 20, 2025
fc45c7a
sneaky modal
cydoval Nov 20, 2025
0b1c098
invoice border radius
cydoval Nov 20, 2025
59681cf
icon on toggle
cydoval Nov 20, 2025
17d95b9
icon in title
cydoval Nov 20, 2025
6fbd36b
Redirects to PublicNotFound action
jSylvestre Nov 21, 2025
2276c67
jasons finds
cydoval Nov 21, 2025
5dced7f
back buttons
cydoval Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/accountSelectControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ export default class AccountSelectControl extends React.Component<
))}
</select>
<div className='input-group-text'>
<button className='btn' type='button' onClick={this.openModal}>
<button
className='btn btn-primary btn-icon'
type='button'
onClick={this.openModal}
>
<i className='fas fa-fw fa-info-circle' />
</button>
</div>
Expand Down Expand Up @@ -165,7 +169,10 @@ export default class AccountSelectControl extends React.Component<
)}
</div>
<div className='col-md-1 d-flex justify-content-end align-items-center'>
<button className='btn' onClick={() => this.modalPickAccount(id)}>
<button
className='btn btn-primary'
onClick={() => this.modalPickAccount(id)}
>
<i className='fas fa-angle-right' />
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/attachmentsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default class AttachmentsControl extends React.Component<IProps, {}> {
<div className='col-1 d-flex justify-content-end align-items-center'>
<a
href={href}
className='btn-link btn-invoice-delete mx-2'
className='btn btn-primary btn-icon me-2'
target='_blank'
rel='noreferrer'
>
Expand All @@ -71,7 +71,7 @@ export default class AttachmentsControl extends React.Component<IProps, {}> {
</a>

<button
className='btn-link btn-invoice-delete ms-2'
className='btn btn-danger btn-icon'
onClick={() => this.removeAttachment(attachment.identifier)}
>
<i className='fas fa-trash-alt' />
Expand Down
4 changes: 2 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/couponSelectControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default class CouponSelectControl extends React.Component<
/>
<div className='input-group-text'>
<button
className='btn'
className='btn btn-primary'
type='button'
onClick={this.modalSetAmount}
>
Expand Down Expand Up @@ -151,7 +151,7 @@ export default class CouponSelectControl extends React.Component<
</div>
<div className='col-md-1 d-flex justify-content-end align-items-center'>
<button
className='btn'
className='btn btn-primary'
onClick={() => this.modalPickCoupon(coupon)}
>
<i className='fas fa-angle-right' />
Expand Down
2 changes: 1 addition & 1 deletion src/Payments.Mvc/ClientApp/src/components/dateControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default class DateControl extends React.Component<IProps, {}> {
required={required}
/>
<div className='input-group-text'>
<button className='btn' type='button'>
<button className='btn btn-primary btn-icon' type='button'>
<i className='far fa-fw fa-calendar' />
</button>
</div>
Expand Down
7 changes: 5 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/discountInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ export default class DiscountInput extends React.PureComponent<IProps, IState> {

if (!discount.hasDiscount) {
return (
<button className='btn-plain primary-color' onClick={this.openModal}>
<i className='fas fa-plus me-2' /> Add coupon
<button
className='btn btn-outline-primary btn-sm'
onClick={this.openModal}
>
<i className='fas fa-plus' /> Add coupon
</button>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/editCustomerModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ export default class EditCustomerModal extends React.Component<IProps, IState> {
</div>
<div className='modal-footer'>
<div className='flex-grow-1 d-flex justify-content-between align-items-center'>
<button className='btn-plain me-3' onClick={onCancel}>
<button className='btn btn-outline-danger me-3' onClick={onCancel}>
Cancel
</button>
<button className='btn' onClick={this.onConfirm}>
<button className='btn btn-primary' onClick={this.onConfirm}>
Save
</button>
</div>
Expand Down
11 changes: 6 additions & 5 deletions src/Payments.Mvc/ClientApp/src/components/editItemsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,11 @@ export default class EditItemsTable extends React.Component<IProps, IState> {
<tr>
<td>
<button
className='btn-plain primary-color'
className='btn btn-primary'
onClick={this.createNewItem}
>
<i className='fas fa-plus me-2' /> Add another item
<i className='fas fa-plus' />
Add another item
</button>
</td>
<td />
Expand Down Expand Up @@ -148,10 +149,10 @@ export default class EditItemsTable extends React.Component<IProps, IState> {
<td>
{discount.hasDiscount && (
<button
className='btn-link btn-invoice-delete'
className='btn btn-danger'
onClick={this.removeDiscount}
>
<i className='fas fa-times' />
<i className='fas fa-times btn-icon' />
</button>
)}
</td>
Expand Down Expand Up @@ -269,7 +270,7 @@ export default class EditItemsTable extends React.Component<IProps, IState> {
<td>${(quantity * amount).toFixed(2)}</td>
<td>
<button
className='btn-link btn-invoice-delete'
className='btn btn-danger btn-icon'
onClick={() => this.removeItem(id)}
>
<i className='fas fa-trash-alt' />
Expand Down
2 changes: 1 addition & 1 deletion src/Payments.Mvc/ClientApp/src/components/fileUpload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default class FileUpload extends React.Component<IProps, IState> {
</div>

<button
className='btn-link btn-invoice-delete'
className='btn btn-danger'
onClick={() => this.cancelUpload(attachment)}
>
<i className='fas fa-times' />
Expand Down
19 changes: 13 additions & 6 deletions src/Payments.Mvc/ClientApp/src/components/multiCustomerControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,23 @@ export default class MultiCustomerControl extends React.Component<
if (!hasMultipleCustomers) {
return (
<button
className='btn'
className='btn btn-primary'
type='button'
onClick={this.enableMultiCustomer}
>
<i className='fas fa-plus me-3' />
<i className='fas fa-users me-3' />
<i className='fas fa-plus' />
<i className='fas fa-users' />
Bill Multiple Customers
</button>
);
}

return (
<button className='btn' type='button' onClick={this.disableMultiCustomer}>
<button
className='btn btn-primary'
type='button'
onClick={this.disableMultiCustomer}
>
<i className='fas fa-user me-2' />
Bill Single Customer
</button>
Expand Down Expand Up @@ -138,11 +142,14 @@ export default class MultiCustomerControl extends React.Component<
readOnly={true}
/>
<div className='input-group-text'>
<button className='btn' onClick={() => this.editCustomer(customer)}>
<button
className='btn btn-primary'
onClick={() => this.editCustomer(customer)}
>
<i className='far fa-fw fa-edit' />
</button>
<button
className='btn'
className='btn btn-primary'
onClick={() => this.removeCustomer(customer.email)}
>
<i className='fas fa-fw fa-times' />
Expand Down
6 changes: 3 additions & 3 deletions src/Payments.Mvc/ClientApp/src/components/rechargeAccountsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@ export default class RechargeAccountsControl extends React.Component<
)}
<button
type='button'
className='btn btn-outline-secondary'
className='btn btn-outline-primary btn-icon'
title='CCOA Picker'
onClick={() =>
this.handleFinancialSegmentPicker(index, direction)
Expand All @@ -1161,7 +1161,7 @@ export default class RechargeAccountsControl extends React.Component<
href={`https://finjector.ucdavis.edu/details/${account.financialSegmentString}`}
target='_blank'
rel='noopener noreferrer'
className={`btn btn-outline-secondary ${
className={`btn btn-outline-primary btn-icon ${
account.isValidating ? 'disabled' : ''
}`}
title='View In Finjector'
Expand Down Expand Up @@ -1208,7 +1208,7 @@ export default class RechargeAccountsControl extends React.Component<
<td className='cell-actions'>
{canRemove && (
<button
className='btn-link btn-invoice-delete'
className='btn btn-danger btn-icon'
onClick={() => removeAccount(index)}
>
<i className='fas fa-trash-alt' />
Expand Down
7 changes: 5 additions & 2 deletions src/Payments.Mvc/ClientApp/src/components/sendModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,13 @@ export default class SendModal extends React.PureComponent<IProps, IState> {
after it's sent.
</span>
<div className='d-flex align-items-baseline'>
<button className='btn-plain me-3' onClick={onCancel}>
<button
className='btn btn-outline-danger me-2'
onClick={onCancel}
>
Cancel
</button>
<button className='btn' onClick={this.onSend}>
<button className='btn btn-primary' onClick={this.onSend}>
Send Invoice
</button>
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/Payments.Mvc/ClientApp/src/components/taxInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ export default class TaxInput extends React.Component<IProps, IState> {

if (!this.state.hasTax) {
return (
<button className='btn-plain primary-color' onClick={this.addTax}>
<button
className='btn btn-outline-primary btn-sm'
onClick={this.addTax}
>
<i className='fas fa-plus me-2' /> Add tax
</button>
);
Expand Down
22 changes: 17 additions & 5 deletions src/Payments.Mvc/ClientApp/src/containers/CreateInvoiceContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default class CreateInvoiceContainer extends React.Component<
<div className='row justify-content-between align-items-center'>
<div className='col'>
<button
className='btn-plain color-unitrans'
className='btn btn-outline-danger'
onClick={this.onCancel}
>
Cancel
Expand All @@ -222,10 +222,13 @@ export default class CreateInvoiceContainer extends React.Component<
{this.renderError()}
</div>
<div className='col d-flex justify-content-end align-items-baseline'>
<button className='btn-plain me-3' onClick={this.onSubmit}>
<button
className='btn btn-outline-primary me-2'
onClick={this.onSubmit}
>
Save and close
</button>
<button className='btn' onClick={this.openSendModal}>
<button className='btn btn-primary' onClick={this.openSendModal}>
Send
</button>
{this.renderSendModal()}
Expand Down Expand Up @@ -264,14 +267,23 @@ export default class CreateInvoiceContainer extends React.Component<
invoiceType === 'CC' ? 'active' : ''
}`}
>
<span>Credit Card</span>
<span>
<i
className='fas fa-credit-card me-2'
title='Credit Card'
></i>
Credit Card
</span>
</div>
<div
className={`invoice-type-toggle-option ${
invoiceType === 'Recharge' ? 'active' : ''
}`}
>
<span>Recharge</span>
<span>
<i className='fas fa-registered me-2' title='Registered'></i>
Recharge
</span>
</div>
<div
className={`invoice-type-toggle-slider ${
Expand Down
12 changes: 9 additions & 3 deletions src/Payments.Mvc/ClientApp/src/containers/EditInvoiceContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export default class EditInvoiceContainer extends React.Component<
<div className='row justify-content-between align-items-center'>
<div className='col'>
<button
className='btn-plain color-unitrans'
className='btn btn-outline-danger'
onClick={this.onCancel}
>
Cancel
Expand All @@ -221,11 +221,17 @@ export default class EditInvoiceContainer extends React.Component<
{this.renderError()}
</div>
<div className='col d-flex justify-content-end align-items-center'>
<button className='btn-plain me-3' onClick={this.onSubmit}>
<button
className='btn btn-outline-primary me-2'
onClick={this.onSubmit}
>
Save and close
</button>
{!sent && (
<button className='btn' onClick={this.openSendModal}>
<button
className='btn btn-primary'
onClick={this.openSendModal}
>
Send
</button>
)}
Expand Down
Loading