Skip to content

Conversation

@joelbrock
Copy link

trying to reconcile harvest and CORE repos. in this instance, harvest has a different houseCoupon prefix than the default.

gohanman and others added 30 commits August 2, 2013 13:08
cashier used an external machine instead of integrated. Drawer
should pop.
if first receipt of the $_SESSION is "printed" via email.
scale-stickered items (i.e., UPC prefix 002)
resolve bug where menu appears and instally goes away. Theory is
it relates to onload vs onready and holding the key down slightly
too long.
to a code merge on my end. Classic can probably go away. No one
uses it and modular is better.
Fixed classnames on ReceiptFormat modules
flathat and others added 29 commits October 8, 2013 03:59
The current, still in-progress, versions.  Not WEFC-only at this point.
Conflicts:
	fannie/classlib2.0/data/models/BasicModel.php
	fannie/cron/lanesync.api.php
	fannie/cron/management/CronManagementPage.php
	fannie/item/import/loadWEFCTorontoProducts.php
	fannie/reports/SalesAndTaxToday/SalesAndTaxTodayReport.php
	fannie/reports/StoreSummary/StoreSummaryReport.php
I added a field for the longer description in the same
place as WEFC.

I put the "Last modified" date where WEFC has vendor SKU mostly
to make use of that space. I don't think a single SKU field is
workable. The VendorItem module does provide SKU and cost fields.
It just provides more of them with a separate set for each vendor.

I move recent & price history links into the horizontal row with the
submit button, "Back" link, etc. It fits well enough and makes the
entire Operations/Links field set unnecessary. I got rid of the
current vs. new shelf tag distinction and put a "Shelf Tag" link on
both the editing page and the little summary that appears after saving
an item. It covers both options in a way that takes less screen space
and gives the user an additional chance to remember they need a tag.

I added the VolumePricing module to emulate WEFC's "Three for a dollar"
fields. It's mostly the same but I made "method" a dropdown rather
than a number. Seems more intuitive to me.

The main things I see remaining are the "sale" fields and some kind
of option to rearrange / re-flow the modules' display order.
I think the sale editing should be disabled by default configuration
with batches as the recommended practice, but we can still support
the option of direct editing. As far as layout goes, I prefer mine :D.
WEFC's is more space efficient, but either way you have to scroll. I think
the uniform width looks better than the variable height (and yes, I do
realize membership uses the latter; that might be have been a poor choice
on my part). Re-ordering the modules will be a necessity either way.
classes/functions or using incorrect paths. Prereq for dynamic
class detection similar to the lane code

Conflicts:
	fannie/item/coupon/RestrictCouponPage.php
At line 799, resolved:
<<<<<<< HEAD
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY, True);
=======
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY);
>>>>>>> flathat/master
keeping HEAD.
I'm reluctant to change things at this level, but there isn't a way
to supply port separately via SQLManager and real_connect() will
not work if it is embedded in $host.

$this-port is defined in the driver and may not always exist.

Port is needed where accessing mysql via ssh tunnel.
A variety of problems and some tweaks discovered upon testing
the programs we used most after pulling from upstream.
NoChangeTender does not allow change
NoDefaultAmountTender requires a typed amount rather than
defaulting to the current amount due.
$_SERVER['REQUEST_METHOD'] not reliably set apparently
well supported in practice but an Epson printer that requires
slight tweaks should be easier to support and completely different
printers are possible if someone really wants.
RPM/DEB packaging scripts joined with generic top-level "scripts"
@gohanman gohanman deleted the hcprefix branch November 22, 2013 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants