Skip to content

Commit

Permalink
Merge branch 'main' into fix-concurrent-invoice-numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmigf committed Oct 9, 2024
2 parents 1dc6ff5 + 828deae commit 6b41ffe
Show file tree
Hide file tree
Showing 348 changed files with 4,282 additions and 1,923 deletions.
3 changes: 3 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
*.gitmodules
*.distignore
*.gitattributes
*.editorconfig
*composer.json
*composer.lock
*strauss.phar
*strauss.md
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']

steps:
- name: Checkout Git repository
Expand Down
118 changes: 111 additions & 7 deletions assets/css/settings-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,15 @@ body.woocommerce_page_wpo_wcpdf_options_page {
margin-bottom: 4em;
}

#wpo-wcpdf-preview-wrapper input#due_date_days {
text-align: right;
}

#wpo-wcpdf-preview-wrapper input#due_date_days:disabled {
background-color: #eaeaea;
color: #999;
}

sup.wcpdf_beta {
background-color: #51266b;
color: white;
Expand Down Expand Up @@ -1120,7 +1129,8 @@ div.upgrade-table-description a,
font-size: 0.8em;
}

#upgrade-table .upgrade-links a.upgrade_button {
#upgrade-table .upgrade-links a.upgrade_button,
#plugin-recommendations a.upgrade_button {
display: inline-block;
background: white;
padding: 1em 3em 1em 2em;
Expand All @@ -1131,7 +1141,8 @@ div.upgrade-table-description a,
position: relative;
}

#upgrade-table .upgrade-links a.upgrade_button:after {
#upgrade-table .upgrade-links a.upgrade_button:after,
#plugin-recommendations a.upgrade_button:after {
content: ' \2192'; /* ASCII code for right arrow */
display: block;
position: absolute;
Expand All @@ -1140,18 +1151,92 @@ div.upgrade-table-description a,
transition: 0.5s;
}

#upgrade-table .upgrade-links a.upgrade_button:hover:after {
#upgrade-table .upgrade-links a.upgrade_button:hover:after,
#plugin-recommendations a.upgrade_button:hover:after {
right: 1.1em;
font-weight: bold;
}


#upgrade-table .upgrade-links a.upgrade_button:focus,
#upgrade-table .upgrade-links a.upgrade_button:hover {
#upgrade-table .upgrade-links a.upgrade_button:hover,
#plugin-recommendations a.upgrade_button:focus,
#plugin-recommendations a.upgrade_button:hover {
background: #6e1edc;
color: #fcfbf7;
}

#plugin-recommendations {
border-radius: 8px;
background-color: #f1e9fc;
padding: 4em 3em;
}

#plugin-recommendations .card-container {
max-width: 1100px;
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-gap: 3em;
padding: 2em 0;
}

#plugin-recommendations .recommendation-card {
margin-top: 0;
border-radius: 6px;
background-color: white;
box-shadow: 0 0 25px -10px rgba(0,0,0,0.2);
box-sizing: border-box;
font-size: 15px;
overflow: hidden;
transition: 0.2s;
}

#plugin-recommendations .recommendation-card:nth-child(n+4) {
display: none;
}

#plugin-recommendations .recommendation-card:hover {
scale: 1.02;
}

#plugin-recommendations .recommendation-card.currently-installed {
opacity: 0.5;
}

#plugin-recommendations .recommendation-card .card-content{
padding: 0 4em 3em 2em;
}

#plugin-recommendations .recommendation-card img {
width: 100%;
}

#plugin-recommendations .recommendation-card h5 {
text-align: left;
font-size: 1.4em;
line-height: 1.3em;
font-weight: bold;
margin: 1em 0;
}

#plugin-recommendations .recommendation-card p {
text-align: left;
padding-bottom: 10px;
}

#plugin-recommendations .recommendation-card a.upgrade_button {
margin: 0;
}

#plugin-recommendations .recommendation-card span.currently-installed {
font-size: 0.7em;
color: white;
background-color: #6e1edc;
padding: 1em 2em;
border-radius: 12px;
margin: 0;
display: inline-block;
}

@media screen and (max-width: 1100px) {
#upgrade-table {
font-size: 1em;
Expand All @@ -1173,21 +1258,36 @@ div.upgrade-table-description a,
#upgrade-table td.feature-label span.description {
padding-top: 6px;
}

#plugin-recommendations .card-container {
grid-gap: 2em;
}
}

@media screen and (max-width: 968px) {
#plugin-recommendations .card-container {
grid-template-columns: repeat(1, 1fr);
padding-right: 40%;
}
}

@media screen and (max-width: 767px) {
#upgrade-table td.feature-label span.description {
display: none;
}

#upgrade-table th:not(.last),
#upgrade-table td:not(.last) {
width: 20%;
}

#upgrade-table td.first {
width: 40%;
}

#plugin-recommendations .card-container {
padding-right: 0;
}
}

@media screen and (max-width: 649px) {
Expand Down Expand Up @@ -1223,4 +1323,8 @@ div.upgrade-table-description a,
#upgrade-table .upgrade-links a:after {
display: none;
}

#plugin-recommendations .card-container {
justify-content: center;
}
}
2 changes: 1 addition & 1 deletion assets/css/settings-styles.min.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/images/generic_document.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/js/admin-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,17 @@ jQuery( function( $ ) {
'delay': 200
} );

$( '#wpo-wcpdf-preview-wrapper #due_date' ).on( 'change', function() {
const $due_date_checkbox = $( '#wpo-wcpdf-preview-wrapper #due_date' );
const $due_date_days_input = $( '#wpo-wcpdf-preview-wrapper #due_date_days' );

if ( $due_date_checkbox.is( ':checked' ) ) {
$due_date_days_input.prop( 'disabled', false );
} else {
$due_date_days_input.prop( 'disabled', true );
}
} ).trigger( 'change' );

//----------> Preview <----------//
// objects
let $previewWrapper = $( '#wpo-wcpdf-preview-wrapper' );
Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin-script.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/js/debug-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jQuery( function( $ ) {
default:
if ( response.success && response.data.message ) {
$notice.addClass( 'notice-success' );
$form.find( '> .notice-warning' ).remove();
} else if ( ! response.success && response.data.message ) {
$notice.addClass( 'notice-error' );
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/debug-script.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 36 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,50 @@
{
"name": "wpovernight/woocommerce-pdf-invoices-packing-slips",
"description": "PDF Invoices & Packing Slips for WooCommerce",
"license": "GPL-3.0-or-later",
"autoload": {
"psr-4": {
"WPO\\WC\\UBL\\": "ubl/"
"WPO\\IPS\\": "includes/",
"WPO\\IPS\\UBL\\": "ubl/"
},
"classmap": [ "includes/" ]
"classmap": [
"vendor/"
]
},
"require": {
"dompdf/dompdf": "^3.0",
"symfony/polyfill-mbstring": "^1.2",
"symfony/polyfill-iconv": "^1.2",
"symfony/polyfill-mbstring": "^1.27",
"symfony/polyfill-iconv": "^1.27",
"sabre/xml": "^2.2.5"
},
"extra": {
"strauss": {
"target_directory": "vendor",
"namespace_prefix": "WPO\\IPS\\Vendor\\",
"classmap_prefix": "WPO_IPS_Vendor_",
"constant_prefix": "WPO_IPS_VENDOR_",
"packages": [],
"update_call_sites": false,
"override_autoload": {},
"exclude_from_copy": {
"packages": [],
"namespaces": [],
"file_patterns": [
"/^psr.*$/"
]
},
"exclude_from_prefix": {
"packages": [
"symfony/polyfill-mbstring",
"symfony/polyfill-iconv"
],
"namespaces": [],
"file_patterns": []
},
"namespace_replacement_patterns": {},
"delete_vendor_packages": false,
"delete_vendor_files": false
}
},
"config": {
"platform-check": false
}
Expand Down
Loading

0 comments on commit 6b41ffe

Please sign in to comment.