Working on the flex attributes for invoices and quotes. Quick meeting with Bryan to show him the progress. We looked over a few things and did some test transactions. We created quotes, restored quotes to cart, made a few invoices and then duplicated those invoices. We have a little bit more work on the submit cart page, but getting much closer. Some of this stuff (code pages) are things that Bryan is wanting for restaurant functionality like areas, sections, tables, number of guests, reservations, etc. Good stuff. Making progress.

After Bryan left, I spent the rest of the time testing code and fixing merge conflicts. This was a pretty big branch, and we ended up with 20 files with merge conflicts. That is because we started it, this flex attribute project, almost 9 months to a year ago. Lots of cart and invoice changes during that time. Anyways, we got it all merged in.