Jb transparent key #13

Open
wants to merge 2,914 commits into
from

Conversation

Projects
None yet
3 participants

tiny little UI improvement
just this, not the rest of it though...
1c53df7
still getting the hang of this pull request thingy

flathat and others added some commits May 17, 2013

userSessions management
Conflicts:
	fannie/auth/utilities.php
userSessions management
Conflicts:
	fannie/auth/utilities.php
member edit auth_class and mod fixes
Conflicts:
	fannie/mem/modules/Notes.php
member edit auth_class and mod fixes
Conflicts:
	fannie/mem/modules/Notes.php
API bugfixes:
Switch default database when requesting a new DB connection
Bad function call in MemDates controller
Table daterange widget correctly
API bugfixes:
Switch default database when requesting a new DB connection
Bad function call in MemDates controller
Table daterange widget correctly
Legacy changes:
remove random mysqli usage
let limited member editors change "gets mail" setting
Legacy changes:
remove random mysqli usage
let limited member editors change "gets mail" setting
Merge remote-tracking branch 'flathat/master'
Conflicts:
	fannie/auth/utilities.php
	fannie/mem/modules/Notes.php
Merge remote-tracking branch 'flathat/master'
Conflicts:
	fannie/auth/utilities.php
	fannie/mem/modules/Notes.php
Bugs in Notes.php
In getting the most recent note.
Alternate scanning interface for inventory counting tool. Has javascript
to support Linea iOS barcode scanner attachment. More touch-oriented.
Provides buttons to increment count by one or by case size(s).
Merging my live lanes with upstream version.
* UnpaidAR was missing echos
* "exit" button on login2 doesn't navigate away from page
* memlist mostly aligning whitespace
* pos2 has faster input retry cycle
* ajax-parser.js also has faster input retry cycle
* Database ships efsnetTokens to server
* DisplayLib alters termdisplaymsg so it pays attention to the
  cashier-facing-device setting
* WFC_Kicker adjusted for AMEX tender type
* DefaultReceiptDataFetch needs fully scoped table
* ReceiptLib store-credit slip shouldn't be emailed
* SQLManager bad arguments for sep()
* CheckTender blocked off wfc-specific behavior better
* QuickMenus revised CC terminal dropdown menu
Merge pull request #191 from CORE-POS/upstream-merge-2013-05-29
Merging my live lanes with upstream version.
I started revising the lane install to be more like Fannie with
separate files defining each table and view. I also removed a few
unused or rarely used structures.

promomsgs and promoMsgsView are both gone. They were only used in
the "new" receipt views (which may go away as well eventually) and
the customReceipt table provides the same functionality.

I moved chargecode and chargeCodeView into a plugin called
WedgeStaffCharge. As far as I know no one is using this feature
and it doesn't need to be present in the default install. I put the
corresponding Parser in the plugin as well as one of the
deprecated PrehLib functions.

gohanman and others added some commits Aug 15, 2013

After ~2 months beta testing line-item taxes are live.
I added an extra, precautionary class_exists call around
using the DiscountModule.
BUGFIX: reload screen on NR so icon updates
FEATURE: allow NR as a suffix or prefix to a tender
Move background image from body's css to separate css class
Make body_class an editable attribute of pages
CSS! I put most of the colors POS uses into one set of
CSS classes and added those classes in the necessary
places. Changes are either adding a class to an element
or replacing an inlined style with a css class.
Merge branch 'reduced-session-usage'
Conflicts:
	pos/is4c-nf/ajax-callbacks/ajax-end.php
	pos/is4c-nf/ajax-callbacks/ajax-endorse.php
	pos/is4c-nf/gui-modules/memlist_cards.php
	pos/is4c-nf/lib/CoreState.php
	pos/is4c-nf/lib/DisplayLib.php
	pos/is4c-nf/lib/TransRecord.php
BUGFIX: clearing training at every login attempt is unnecessary.
The scale reset is redundant; login2/login3 do it too
BUGFIX: clearing training at every login attempt is unnecessary.
The scale reset is redundant; login2/login3 do it too
Check for new or relocated files when autoloading classes.
Ignore missing Preparser & Parser modules so they can
be deleted/disabled in real time
Member

joelbrock commented on 1aa4b72 Aug 27, 2013

@gohanman the kickOnSignOut doesnt seem to have an effect.
I added this new logic to the Harvest_Kicker subclass as well as Kicker.php but the drawer still kicks on signout from training mode.

Contributor

gohanman replied Aug 27, 2013

I know. parser-class-lib/parser/Steering.php needs similar logic to gui-modules/login2.php. Right now it doesn't use the Kicker class at all. I just haven't had a chance to try it.

Contributor

gohanman replied Aug 29, 2013

@gohanman gohanman deleted the CORE-POS:jb-transparent-key branch Aug 11, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment